diff --git a/.gitignore b/.gitignore index 46a3c44..9330d81 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ Cargo.lock ming-wm password.txt bmps/ignore-*.bmp +*.alpha diff --git a/Cargo.toml b/Cargo.toml index 08156ef..f07b05d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "ming-wm" version = "0.1.0" -edition = "2018" +edition = "2024" default-run = "main" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -13,16 +13,32 @@ blake2 = { version = "0.10.6", default-features = false } [dependencies] blake2 = { version = "0.10.6", default-features = false } linux_framebuffer = { package = "framebuffer", version = "0.3.1" } -termion = "4.0.3" +termion = { version = "4.0.3", optional = true } rodio = { version = "0.19.0", optional = true } -rand = { version = "0.8.5", optional = true } -audiotags = { version = "0.5.0", optional = true } +rand = { version = "0.9.0", default-features = false, features = [ "small_rng" ], optional = true } +id3 = { version = "1.10.0", optional = true } +mp4ameta = { version = "0.11.0", optional = true } +metaflac = { version = "0.2.5", optional = true } bmp-rust = "0.4.1" -dirs = "5.0.1" +pty-process = { version = "0.5.1", optional = true } + +[features] +default = [ "main", "terminal" ] +main = [ "termion" ] +terminal = [ "pty-process" ] +audio_player = [ "id3", "mp4ameta", "metaflac", "rand", "rodio" ] [profile.release] lto = true +[[bin]] +name = "main" +required-features = [ "main" ] + [[bin]] name = "audio_player" -required-features = [ "audiotags", "rand", "rodio" ] +required-features = [ "audio_player" ] + +[[bin]] +name = "terminal" +required-features = [ "terminal" ] diff --git a/bmps/nimbus-roman/!.alpha b/bmps/nimbus-roman/!.alpha deleted file mode 100644 index 25afd84..0000000 --- a/bmps/nimbus-roman/!.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -189,179 -247,241 -220,222 -190,190 -159,159 -126,127 -93,95 -66,63 -34,27 -, -161,149 -192,195 \ No newline at end of file diff --git "a/bmps/nimbus-roman/\".alpha" "b/bmps/nimbus-roman/\".alpha" deleted file mode 100644 index 9702942..0000000 --- "a/bmps/nimbus-roman/\".alpha" +++ /dev/null @@ -1,6 +0,0 @@ -0 -202,122,,121,202 -230,145,,146,229 -191,108,,108,192 -153,71,,69,154 -114,32,,30,116 \ No newline at end of file diff --git a/bmps/nimbus-roman/#.alpha b/bmps/nimbus-roman/#.alpha deleted file mode 100644 index 204495f..0000000 --- a/bmps/nimbus-roman/#.alpha +++ /dev/null @@ -1,12 +0,0 @@ -1 -,,53,188,,28,213, -,,92,149,,66,175, -,,130,111,,103,138, -95,170,222,199,170,212,208,170 -38,68,222,91,68,201,112,68 -,1,237,4,,214,27, -136,144,240,136,136,247,137,81 -102,148,201,102,128,221,102,61 -,108,133,,73,168,, -,145,96,,109,132,, -,183,58,,144,97,, \ No newline at end of file diff --git a/bmps/nimbus-roman/$.alpha b/bmps/nimbus-roman/$.alpha deleted file mode 100644 index dfe1689..0000000 --- a/bmps/nimbus-roman/$.alpha +++ /dev/null @@ -1,15 +0,0 @@ -2 -,,,147,,, -2,113,144,200,133,128,15 -120,164,,151,,114,117 -204,110,,151,,3,91 -176,214,28,151,,, -39,238,231,180,,, -,38,196,255,187,35, -,,1,190,232,243,55 -,,,147,24,218,210 -55,,,147,,105,246 -171,,,147,,111,201 -216,129,21,149,64,203,52 -2,67,107,198,80,12, -,,,147,,, \ No newline at end of file diff --git a/bmps/nimbus-roman/%.alpha b/bmps/nimbus-roman/%.alpha deleted file mode 100644 index 25ddea2..0000000 --- a/bmps/nimbus-roman/%.alpha +++ /dev/null @@ -1,12 +0,0 @@ -1 -,19,145,140,91,1,13,115,145,, -20,222,88,,123,97,100,181,24,, -150,189,,,105,,57,130,,, -223,95,,,113,,173,14,,, -238,59,,68,65,79,109,,5,24, -117,171,114,92,3,179,6,80,197,115,132 -,25,10,,100,88,60,247,34,,108 -,,,10,177,1,189,156,,,113 -,,,122,67,,239,84,,6,114 -,,20,169,,,214,70,,110,26 -,,142,48,,,55,155,114,37, \ No newline at end of file diff --git a/bmps/nimbus-roman/&.alpha b/bmps/nimbus-roman/&.alpha deleted file mode 100644 index b4a2491..0000000 --- a/bmps/nimbus-roman/&.alpha +++ /dev/null @@ -1,12 +0,0 @@ -1 -,,,127,144,155,76,,,, -,,72,201,,4,206,,,, -,,122,205,,14,209,,,, -,,90,251,41,171,77,,,, -,,27,254,207,39,,116,255,176,39 -,58,179,183,241,21,,25,204,4, -58,213,18,30,247,155,,118,56,, -198,126,,,131,254,111,133,,, -245,138,,,6,204,255,55,,, -203,237,43,,41,171,222,236,87,49,126 -44,194,245,202,147,19,20,176,246,198,36 \ No newline at end of file diff --git a/bmps/nimbus-roman/'.alpha b/bmps/nimbus-roman/'.alpha deleted file mode 100644 index 172c56b..0000000 --- a/bmps/nimbus-roman/'.alpha +++ /dev/null @@ -1,5 +0,0 @@ -0 -203 -207 -151 -94 \ No newline at end of file diff --git a/bmps/nimbus-roman/(.alpha b/bmps/nimbus-roman/(.alpha deleted file mode 100644 index 7d540a3..0000000 --- a/bmps/nimbus-roman/(.alpha +++ /dev/null @@ -1,17 +0,0 @@ -0 -,,,33,119 -,,59,154,6 -,39,210,11, -1,203,100,, -78,254,24,, -166,219,,, -223,199,,, -246,181,,, -244,183,,, -220,200,,, -159,225,,, -68,255,31,, -,188,103,, -,26,192,7, -,,52,151,6 -,,,42,127 \ No newline at end of file diff --git a/bmps/nimbus-roman/).alpha b/bmps/nimbus-roman/).alpha deleted file mode 100644 index 12658ef..0000000 --- a/bmps/nimbus-roman/).alpha +++ /dev/null @@ -1,17 +0,0 @@ -0 -127,42,,, -6,151,52,, -,7,193,26, -,,103,187, -,,31,255,67 -,,,226,158 -,,,201,219 -,,,184,243 -,,,181,245 -,,,200,221 -,,,221,163 -,,26,254,75 -,,101,200,1 -,12,212,38, -6,156,58,, -119,33,,, \ No newline at end of file diff --git a/bmps/nimbus-roman/*.alpha b/bmps/nimbus-roman/*.alpha deleted file mode 100644 index ac5fa00..0000000 --- a/bmps/nimbus-roman/*.alpha +++ /dev/null @@ -1,8 +0,0 @@ -0 -,,117,123,, -109,17,103,108,24,112 -156,190,82,78,196,157 -,15,163,158,9, -152,190,72,70,193,158 -108,21,103,106,21,107 -,,122,121,, \ No newline at end of file diff --git a/bmps/nimbus-roman/+.alpha b/bmps/nimbus-roman/+.alpha deleted file mode 100644 index 371d9a5..0000000 --- a/bmps/nimbus-roman/+.alpha +++ /dev/null @@ -1,9 +0,0 @@ -2 -,,,134,134,,, -,,,134,134,,, -,,,134,134,,, -134,134,134,197,197,134,134,134 -134,134,134,197,197,134,134,134 -,,,134,134,,, -,,,134,134,,, -,,,134,134,,, \ No newline at end of file diff --git a/bmps/nimbus-roman/,.alpha b/bmps/nimbus-roman/,.alpha deleted file mode 100644 index 33949a6..0000000 --- a/bmps/nimbus-roman/,.alpha +++ /dev/null @@ -1,6 +0,0 @@ -9 -176,240,100 -226,255,237 -17,48,199 -,97,94 -79,99, \ No newline at end of file diff --git a/bmps/nimbus-roman/-.alpha b/bmps/nimbus-roman/-.alpha deleted file mode 100644 index e967781..0000000 --- a/bmps/nimbus-roman/-.alpha +++ /dev/null @@ -1,2 +0,0 @@ -8 -255,255,255,255 \ No newline at end of file diff --git a/bmps/nimbus-roman/0.alpha b/bmps/nimbus-roman/0.alpha deleted file mode 100644 index 9f5f68e..0000000 --- a/bmps/nimbus-roman/0.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,16,149,125,133,152,14, -2,191,126,,,128,190,1 -80,255,32,,,34,255,82 -168,227,,,,,229,171 -224,202,,,,,203,223 -247,187,,,,,187,247 -244,185,,,,,185,245 -218,200,,,,,201,220 -164,223,,,,,225,166 -79,255,27,,,29,255,78 -2,196,119,,,123,190,2 -,18,155,132,126,148,16, \ No newline at end of file diff --git a/bmps/nimbus-roman/1.alpha b/bmps/nimbus-roman/1.alpha deleted file mode 100644 index abe291a..0000000 --- a/bmps/nimbus-roman/1.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,40,167,80, -89,172,255,82, -,53,255,82, -,51,255,82, -,51,255,82, -,51,255,82, -,51,255,82, -,51,255,82, -,51,255,82, -,51,255,82, -,58,255,83, -68,177,255,179,75 \ No newline at end of file diff --git a/bmps/nimbus-roman/2.alpha b/bmps/nimbus-roman/2.alpha deleted file mode 100644 index 0a55938..0000000 --- a/bmps/nimbus-roman/2.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,54,186,240,221,124,5, -39,197,98,102,198,255,137, -142,19,,,5,212,240,2 -67,,,,,135,254,9 -,,,,,144,207, -,,,,1,217,89, -,,,,89,168,, -,,,29,172,8,, -,,15,153,14,,, -,12,149,17,,,,47 -8,180,105,85,85,85,106,140 -180,255,255,255,255,255,255,55 \ No newline at end of file diff --git a/bmps/nimbus-roman/3.alpha b/bmps/nimbus-roman/3.alpha deleted file mode 100644 index a3a1510..0000000 --- a/bmps/nimbus-roman/3.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,77,203,245,217,91, -77,132,28,35,178,252,42 -88,,,,31,255,88 -,,,,45,239,25 -,,,10,170,52, -,1,108,219,255,205,27 -,,7,34,144,255,168 -,,,,,165,236 -,,,,,89,239 -,,,,,112,168 -123,83,1,,21,190,29 -160,242,203,126,107,16, \ No newline at end of file diff --git a/bmps/nimbus-roman/4.alpha b/bmps/nimbus-roman/4.alpha deleted file mode 100644 index 7566ecb..0000000 --- a/bmps/nimbus-roman/4.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,,,10,216,58, -,,,,144,255,58, -,,,68,132,255,58, -,,16,156,34,255,58, -,,151,28,33,255,58, -,82,87,,33,255,58, -26,147,,,33,255,58, -169,52,34,34,62,255,84,34 -255,255,255,255,255,255,255,255 -17,17,17,17,44,255,71,17 -,,,,29,255,58, -,,,,29,255,58, \ No newline at end of file diff --git a/bmps/nimbus-roman/5.alpha b/bmps/nimbus-roman/5.alpha deleted file mode 100644 index a7664a8..0000000 --- a/bmps/nimbus-roman/5.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,93,136,136,136,144 -,20,220,204,204,204,90 -,129,59,,,, -11,229,149,85,15,, -62,217,252,255,239,85, -,,11,102,232,251,55 -,,,,31,240,164 -,,,,,146,197 -,,,,,116,180 -,,,,,158,106 -146,112,5,,52,182,6 -152,240,209,135,107,5, \ No newline at end of file diff --git a/bmps/nimbus-roman/6.alpha b/bmps/nimbus-roman/6.alpha deleted file mode 100644 index c79d359..0000000 --- a/bmps/nimbus-roman/6.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,,5,92,144,107,51 -,,48,215,150,14,, -,65,244,118,,,, -21,231,198,1,,,, -125,255,106,108,143,110,21, -208,255,127,59,85,217,234,42 -241,206,,,,34,252,179 -244,190,,,,,201,234 -206,214,,,,,176,243 -127,250,23,,,,195,185 -16,224,146,,,30,244,56 -,29,165,158,128,160,59, \ No newline at end of file diff --git a/bmps/nimbus-roman/7.alpha b/bmps/nimbus-roman/7.alpha deleted file mode 100644 index 81fc159..0000000 --- a/bmps/nimbus-roman/7.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -56,255,255,255,255,255,236 -145,119,85,85,85,152,163 -87,,,,,164,88 -,,,,3,232,17 -,,,,65,191, -,,,,142,116, -,,,,218,41, -,,,41,222,, -,,,119,145,, -,,,196,70,, -,,19,240,7,, -,,95,174,,, \ No newline at end of file diff --git a/bmps/nimbus-roman/8.alpha b/bmps/nimbus-roman/8.alpha deleted file mode 100644 index 7ec6f17..0000000 --- a/bmps/nimbus-roman/8.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -2,113,139,127,168,107, -122,167,,,6,220,85 -210,128,,,,168,146 -196,223,18,,4,219,89 -60,248,212,54,161,120, -,66,241,255,150,1, -,93,152,204,255,166,3 -102,192,1,6,148,255,133 -232,108,,,,175,234 -234,113,,,,104,231 -145,203,6,,,162,141 -7,127,174,129,141,123,6 \ No newline at end of file diff --git a/bmps/nimbus-roman/9.alpha b/bmps/nimbus-roman/9.alpha deleted file mode 100644 index b3a2924..0000000 --- a/bmps/nimbus-roman/9.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,71,149,129,176,51, -57,223,4,,61,240,24 -183,157,,,,218,138 -233,134,,,,174,208 -239,154,,,,155,242 -188,224,3,,,153,237 -57,243,165,64,108,221,203 -,37,116,113,44,238,126 -,,,,99,241,25 -,,,32,239,97, -,,56,218,103,, -55,126,137,37,,, \ No newline at end of file diff --git a/bmps/nimbus-roman/:.alpha b/bmps/nimbus-roman/:.alpha deleted file mode 100644 index 0223dc1..0000000 --- a/bmps/nimbus-roman/:.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -199,195 -159,162 -, -, -, -, -171,167 -194,190 \ No newline at end of file diff --git a/bmps/nimbus-roman/;.alpha b/bmps/nimbus-roman/;.alpha deleted file mode 100644 index ef011e2..0000000 --- a/bmps/nimbus-roman/;.alpha +++ /dev/null @@ -1,12 +0,0 @@ -4 -177,235,49 -188,242,55 -,, -,, -,, -,, -59,102,18 -240,255,201 -76,127,221 -,63,124 -70,112,1 \ No newline at end of file diff --git a/bmps/nimbus-roman/<.alpha b/bmps/nimbus-roman/<.alpha deleted file mode 100644 index 207ac90..0000000 --- a/bmps/nimbus-roman/<.alpha +++ /dev/null @@ -1,8 +0,0 @@ -2 -,,,,13,126,174 -,,6,102,231,187,50 -4,98,225,194,60,, -135,255,172,4,,, -,56,197,217,85,, -,,1,85,222,190,49 -,,,,9,121,175 \ No newline at end of file diff --git a/bmps/nimbus-roman/=.alpha b/bmps/nimbus-roman/=.alpha deleted file mode 100644 index 6a5f12e..0000000 --- a/bmps/nimbus-roman/=.alpha +++ /dev/null @@ -1,5 +0,0 @@ -4 -254,254,254,254,254,254,254,254 -,,,,,,, -,,,,,,, -254,254,254,254,254,254,254,254 \ No newline at end of file diff --git a/bmps/nimbus-roman/>.alpha b/bmps/nimbus-roman/>.alpha deleted file mode 100644 index c32bb44..0000000 --- a/bmps/nimbus-roman/>.alpha +++ /dev/null @@ -1,8 +0,0 @@ -2 -174,126,13,,,, -43,170,235,119,8,, -,,60,194,225,98,4 -,,,4,172,255,135 -,,68,210,204,63, -42,182,227,102,2,, -175,121,9,,,, \ No newline at end of file diff --git a/bmps/nimbus-roman/?.alpha b/bmps/nimbus-roman/?.alpha deleted file mode 100644 index 857afc5..0000000 --- a/bmps/nimbus-roman/?.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -24,124,131,183,137,10 -173,8,,13,227,169 -241,95,,,163,242 -116,54,,,180,218 -,,,5,237,112 -,,,77,195,4 -,,,167,27, -,,11,116,, -,,48,45,, -,,,,, -,,155,130,, -,,194,169,, \ No newline at end of file diff --git a/bmps/nimbus-roman/@.alpha b/bmps/nimbus-roman/@.alpha deleted file mode 100644 index dce7635..0000000 --- a/bmps/nimbus-roman/@.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,2,88,158,141,138,145,144,40,, -,18,189,130,6,,,,21,162,94, -3,194,147,,,,5,2,,1,170,55 -99,243,18,,5,146,220,178,178,101,27,174 -194,174,,,141,193,12,44,255,56,,185 -240,130,,25,248,36,,57,242,4,,170 -244,124,,92,221,,,121,181,,2,166 -204,160,,104,217,,13,223,120,,89,81 -113,235,11,33,241,161,117,142,182,117,119,1 -7,207,149,,24,44,,1,53,33,, -,25,199,162,25,,,,12,90,4, -,,4,93,181,180,174,167,149,61,1, \ No newline at end of file diff --git a/bmps/nimbus-roman/A.alpha b/bmps/nimbus-roman/A.alpha deleted file mode 100644 index c62cc24..0000000 --- a/bmps/nimbus-roman/A.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,,,,114,83,,,,, -,,,,1,217,192,,,,, -,,,,68,232,255,47,,,, -,,,,170,57,252,155,,,, -,,,26,170,,179,246,19,,, -,,,130,70,,74,255,119,,, -,,5,194,2,,1,219,225,4,, -,,85,213,153,153,153,213,255,82,, -,,186,48,34,34,34,55,252,191,, -,56,174,,,,,,177,255,45, -,181,90,,,,,,93,255,168, -133,255,170,42,,,,41,156,255,254,126 \ No newline at end of file diff --git a/bmps/nimbus-roman/B.alpha b/bmps/nimbus-roman/B.alpha deleted file mode 100644 index 987e787..0000000 --- a/bmps/nimbus-roman/B.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -102,211,255,219,172,181,208,136,25, -,96,255,113,,,38,232,224,13 -,85,255,112,,,,125,255,85 -,85,255,112,,,,109,255,85 -,85,255,112,,,12,203,230,17 -,85,255,198,153,176,235,175,27, -,85,255,127,34,57,126,242,189,22 -,85,255,112,,,,81,255,170 -,85,255,112,,,,8,255,240 -,85,255,112,,,,29,255,215 -,97,255,115,,,9,167,255,96 -101,211,255,235,179,192,215,188,88, \ No newline at end of file diff --git a/bmps/nimbus-roman/C.alpha b/bmps/nimbus-roman/C.alpha deleted file mode 100644 index ee2c874..0000000 --- a/bmps/nimbus-roman/C.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,10,111,197,195,180,191,160,127,150 -,35,215,208,41,,,,85,237,169 -11,221,235,23,,,,,,73,179 -121,255,130,,,,,,,,137 -204,255,62,,,,,,,, -241,255,34,,,,,,,, -246,255,40,,,,,,,, -214,255,72,,,,,,,, -138,255,143,,,,,,,, -24,236,243,33,,,,,,,68 -,59,234,223,79,,,,33,150,78 -,,22,132,208,230,196,175,137,26, \ No newline at end of file diff --git a/bmps/nimbus-roman/D.alpha b/bmps/nimbus-roman/D.alpha deleted file mode 100644 index d794b20..0000000 --- a/bmps/nimbus-roman/D.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -106,219,255,230,180,191,206,170,88,4,, -,117,255,109,,,3,89,239,209,36, -,108,255,104,,,,,47,246,224,17 -,108,255,104,,,,,,132,255,129 -,108,255,104,,,,,,43,255,210 -,108,255,104,,,,,,5,253,245 -,108,255,104,,,,,,3,252,241 -,108,255,104,,,,,,29,255,201 -,108,255,104,,,,,,105,255,116 -,108,255,104,,,,,21,230,218,10 -,120,255,111,,,3,73,220,210,36, -107,223,255,232,179,189,203,175,91,6,, \ No newline at end of file diff --git a/bmps/nimbus-roman/E.alpha b/bmps/nimbus-roman/E.alpha deleted file mode 100644 index 20846a9..0000000 --- a/bmps/nimbus-roman/E.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -109,232,255,206,170,170,182,218,255,23 -,144,255,61,,,,,170,28 -,130,255,59,,,,,57,19 -,130,255,59,,,,30,14, -,130,255,59,,,,125,35, -,130,255,190,170,170,190,251,35, -,130,255,72,17,17,37,185,35, -,130,255,59,,,,70,28, -,130,255,59,,,,,,8 -,130,255,59,,,,,,161 -,145,255,61,,,,5,135,155 -110,233,255,224,183,172,191,236,255,91 \ No newline at end of file diff --git a/bmps/nimbus-roman/F.alpha b/bmps/nimbus-roman/F.alpha deleted file mode 100644 index 4e0af08..0000000 --- a/bmps/nimbus-roman/F.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -110,234,255,202,170,170,184,225,245 -,149,255,49,,,,2,193 -,136,255,47,,,,,75 -,136,255,47,,,,44, -,136,255,47,,,,160, -,136,255,186,170,172,208,222, -,136,255,61,17,18,52,196, -,136,255,47,,,,97, -,136,255,47,,,,, -,137,255,47,,,,, -,150,255,58,,,,, -110,233,255,189,70,,,, \ No newline at end of file diff --git a/bmps/nimbus-roman/G.alpha b/bmps/nimbus-roman/G.alpha deleted file mode 100644 index 95f35c9..0000000 --- a/bmps/nimbus-roman/G.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,12,120,201,193,180,188,154,140,121, -,38,220,201,38,,,1,98,247,131, -12,219,229,17,,,,,,106,142, -118,255,121,,,,,,,5,91, -202,255,49,,,,,,,,, -241,255,16,,,,,45,102,102,102,95 -248,255,12,,,,,,44,255,226,10 -218,255,42,,,,,,,247,194, -144,255,114,,,,,,,245,193, -26,234,229,20,,,,,,245,193, -,50,226,210,50,,,,40,252,183, -,,12,114,195,197,180,171,172,99,10, \ No newline at end of file diff --git a/bmps/nimbus-roman/H.alpha b/bmps/nimbus-roman/H.alpha deleted file mode 100644 index 1cd9ee8..0000000 --- a/bmps/nimbus-roman/H.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -107,224,255,211,92,,,91,210,255,225,108 -,127,255,96,,,,,97,255,125, -,116,255,87,,,,,87,255,116, -,116,255,87,,,,,87,255,116, -,116,255,87,,,,,87,255,116, -,116,255,176,136,136,136,136,176,255,116, -,116,255,132,68,68,68,68,132,255,116, -,116,255,87,,,,,87,255,116, -,116,255,87,,,,,87,255,116, -,116,255,87,,,,,87,255,116, -,130,255,98,,,,,100,255,127, -107,226,255,213,93,,,91,212,255,227,109 \ No newline at end of file diff --git a/bmps/nimbus-roman/I.alpha b/bmps/nimbus-roman/I.alpha deleted file mode 100644 index d0061b5..0000000 --- a/bmps/nimbus-roman/I.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -103,213,255,212,100 -,104,255,101, -,94,255,90, -,94,255,90, -,94,255,90, -,94,255,90, -,94,255,90, -,94,255,90, -,94,255,90, -,94,255,90, -,105,255,102, -101,213,255,214,101 \ No newline at end of file diff --git a/bmps/nimbus-roman/J.alpha b/bmps/nimbus-roman/J.alpha deleted file mode 100644 index f034010..0000000 --- a/bmps/nimbus-roman/J.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,77,194,255,223,104 -,,69,255,128, -,,60,255,119, -,,60,255,119, -,,60,255,119, -,,60,255,119, -,,60,255,119, -,,60,255,119, -,,60,255,114, -13,2,60,255,86, -225,143,76,241,18, -147,235,173,68,, \ No newline at end of file diff --git a/bmps/nimbus-roman/K.alpha b/bmps/nimbus-roman/K.alpha deleted file mode 100644 index 4ca1605..0000000 --- a/bmps/nimbus-roman/K.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -106,224,255,210,97,,38,152,255,219,113,14 -,124,255,97,,,,129,193,18,, -,111,255,88,,,86,190,10,,, -,111,255,88,,89,194,13,,,, -,111,255,88,103,204,17,,,,, -,111,255,191,254,135,,,,,, -,111,255,157,219,255,102,,,,, -,111,255,88,29,222,252,82,,,, -,111,255,88,,36,235,246,58,,, -,111,255,88,,,59,247,236,42,, -,125,255,98,,,,113,255,231,40, -107,225,255,212,94,,27,129,255,255,231,111 \ No newline at end of file diff --git a/bmps/nimbus-roman/L.alpha b/bmps/nimbus-roman/L.alpha deleted file mode 100644 index 4448931..0000000 --- a/bmps/nimbus-roman/L.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -109,232,255,196,80,,,,, -,144,255,70,,,,,, -,131,255,58,,,,,, -,131,255,58,,,,,, -,131,255,58,,,,,, -,131,255,58,,,,,, -,131,255,58,,,,,, -,131,255,58,,,,,, -,131,255,58,,,,,,15 -,131,255,58,,,,,,153 -,145,255,61,,,,8,137,145 -110,233,255,228,190,187,198,241,255,79 \ No newline at end of file diff --git a/bmps/nimbus-roman/M.alpha b/bmps/nimbus-roman/M.alpha deleted file mode 100644 index f4b27b6..0000000 --- a/bmps/nimbus-roman/M.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -96,206,255,190,,,,,,,,184,255,228,107 -,86,255,255,49,,,,,,39,246,255,131, -,74,255,255,162,,,,,,147,156,255,119, -,74,125,215,250,28,,,,13,203,86,255,119, -,74,124,107,255,134,,,,109,105,85,255,119, -,74,124,10,236,238,12,,1,199,11,85,255,119, -,74,124,,135,255,107,,71,138,,85,255,119, -,74,124,,26,249,218,2,177,33,,85,255,119, -,74,124,,,164,255,110,169,,,85,255,119, -,78,127,,,51,255,252,62,,,85,255,119, -,105,154,,,,193,206,,,,99,255,131, -109,224,243,122,12,,80,95,,,98,214,255,228,108 \ No newline at end of file diff --git a/bmps/nimbus-roman/N.alpha b/bmps/nimbus-roman/N.alpha deleted file mode 100644 index 3bee3ce..0000000 --- a/bmps/nimbus-roman/N.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -114,240,255,87,,,,5,112,234,231,111 -,96,255,242,40,,,,,132,122, -,83,191,254,213,12,,,,105,95, -,83,111,140,255,168,,,,102,92, -,83,111,4,192,255,107,,,102,92, -,83,111,,23,228,250,59,,102,92, -,83,111,,,56,249,226,21,102,92, -,83,111,,,,111,255,188,105,92, -,83,111,,,,,167,255,216,92, -,89,116,,,,,12,212,255,92, -,124,152,,,,,,39,241,92, -107,194,200,113,5,,,,,83,91, \ No newline at end of file diff --git a/bmps/nimbus-roman/O.alpha b/bmps/nimbus-roman/O.alpha deleted file mode 100644 index 079b041..0000000 --- a/bmps/nimbus-roman/O.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,37,158,189,168,188,156,34,, -,71,244,114,,,1,112,244,70, -27,239,166,,,,,,169,240,29 -138,255,68,,,,,,68,255,139 -212,254,14,,,,,,13,255,211 -246,242,,,,,,,,244,244 -245,242,,,,,,,,245,245 -212,254,11,,,,,,16,255,213 -139,255,67,,,,,,74,255,140 -29,241,165,,,,,,164,240,27 -,72,243,104,1,,1,111,243,71, -,,33,154,185,166,184,153,34,, \ No newline at end of file diff --git a/bmps/nimbus-roman/P.alpha b/bmps/nimbus-roman/P.alpha deleted file mode 100644 index 8d0bf81..0000000 --- a/bmps/nimbus-roman/P.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -112,235,255,202,192,213,179,72, -,154,255,49,,9,153,254,98 -,143,255,47,,,9,251,220 -,143,255,47,,,,231,244 -,143,255,47,,,26,254,188 -,143,255,47,3,47,196,236,45 -,143,255,196,190,175,123,25, -,143,255,47,,,,, -,143,255,47,,,,, -,144,255,47,,,,, -,156,255,58,,,,, -112,235,255,188,77,,,, \ No newline at end of file diff --git a/bmps/nimbus-roman/Q.alpha b/bmps/nimbus-roman/Q.alpha deleted file mode 100644 index 45ad2df..0000000 --- a/bmps/nimbus-roman/Q.alpha +++ /dev/null @@ -1,16 +0,0 @@ -0 -,,19,133,191,164,176,189,105,5,, -,48,230,167,13,,,35,207,198,18, -16,227,212,4,,,,,32,249,182, -124,255,111,,,,,,,171,255,63 -205,255,50,,,,,,,110,255,144 -243,255,21,,,,,,,83,255,182 -247,255,22,,,,,,,82,255,185 -216,255,45,,,,,,,109,255,153 -142,255,101,,,,,,,166,255,78 -28,240,198,,,,,,18,244,201,2 -,69,242,130,3,,,9,176,221,28, -,,38,155,206,149,163,195,136,13,, -,,,,82,252,255,132,,,, -,,,,,74,236,255,145,8,, -,,,,,,12,106,175,197,130,101 \ No newline at end of file diff --git a/bmps/nimbus-roman/R.alpha b/bmps/nimbus-roman/R.alpha deleted file mode 100644 index da68be4..0000000 --- a/bmps/nimbus-roman/R.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -112,234,255,214,181,208,197,103,2,, -,149,255,56,,1,110,255,142,, -,138,255,52,,,,229,245,2, -,138,255,52,,,,220,253,8, -,138,255,52,,,44,254,191,, -,138,255,103,81,139,234,174,26,, -,138,255,142,198,255,75,,,, -,138,255,52,28,236,227,21,,, -,138,255,52,,76,254,189,3,, -,139,255,52,,,149,255,129,, -,153,255,62,,,8,209,253,73, -111,235,255,192,75,,,42,245,246,124 \ No newline at end of file diff --git a/bmps/nimbus-roman/S.alpha b/bmps/nimbus-roman/S.alpha deleted file mode 100644 index ba88970..0000000 --- a/bmps/nimbus-roman/S.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,53,190,189,184,156,157,68 -28,239,87,,,70,238,96 -100,255,28,,,,85,123 -102,255,147,1,,,3,97 -20,236,255,175,29,,, -,47,218,255,244,119,5, -,,7,125,247,255,191,15 -,,,,38,217,255,157 -100,,,,,26,244,238 -198,25,,,,,216,216 -174,202,24,,,54,252,101 -134,127,158,157,171,197,89, \ No newline at end of file diff --git a/bmps/nimbus-roman/T.alpha b/bmps/nimbus-roman/T.alpha deleted file mode 100644 index bbba02a..0000000 --- a/bmps/nimbus-roman/T.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -232,247,208,189,247,247,189,208,247,232 -220,27,,,226,226,,,27,219 -141,,,,226,226,,,,140 -7,,,,226,226,,,,7 -,,,,226,226,,,, -,,,,226,226,,,, -,,,,226,226,,,, -,,,,226,226,,,, -,,,,226,226,,,, -,,,,226,226,,,, -,,,1,239,237,,,, -,,50,149,255,255,148,53,, \ No newline at end of file diff --git a/bmps/nimbus-roman/U.alpha b/bmps/nimbus-roman/U.alpha deleted file mode 100644 index 068c0af..0000000 --- a/bmps/nimbus-roman/U.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -104,221,255,209,93,,,2,111,234,229,110 -,121,255,95,,,,,,131,119, -,112,255,86,,,,,,105,97, -,112,255,86,,,,,,102,94, -,112,255,86,,,,,,102,94, -,112,255,86,,,,,,102,94, -,112,255,86,,,,,,102,94, -,110,255,87,,,,,,105,88, -,92,255,102,,,,,,119,68, -,36,254,156,,,,,,172,16, -,,163,249,77,,,7,120,133,, -,,5,122,214,219,195,187,99,1,, \ No newline at end of file diff --git a/bmps/nimbus-roman/V.alpha b/bmps/nimbus-roman/V.alpha deleted file mode 100644 index 1f7f30b..0000000 --- a/bmps/nimbus-roman/V.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -118,250,255,183,63,,,,63,186,253,120 -,141,255,147,,,,,,110,163, -,16,242,235,5,,,,,182,46, -,,143,255,90,,,,28,198,, -,,32,252,204,,,,127,102,, -,,,172,255,60,,2,213,14,, -,,,59,255,173,,74,157,,, -,,,,200,252,35,175,58,,, -,,,,89,255,167,209,,,, -,,,,4,225,255,114,,,, -,,,,,118,249,21,,,, -,,,,,16,157,,,,, \ No newline at end of file diff --git a/bmps/nimbus-roman/W.alpha b/bmps/nimbus-roman/W.alpha deleted file mode 100644 index 5bc38ab..0000000 --- a/bmps/nimbus-roman/W.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -128,253,255,138,21,65,201,255,214,96,,,42,174,252,134 -,172,255,63,,,39,253,191,,,,,79,163, -,53,255,148,,,,185,252,28,,,,138,67, -,,216,236,7,,,119,255,120,,,1,201,3, -,,128,255,82,,,187,238,215,,,61,150,, -,,39,255,177,,36,167,151,255,56,,152,62,, -,,,205,251,23,130,78,58,255,151,6,211,3,, -,,,116,255,111,204,7,,216,240,88,144,,, -,,,29,253,237,153,,,126,255,233,59,,, -,,,,194,255,63,,,32,254,226,1,,, -,,,,105,229,2,,,,194,140,,,, -,,,,20,134,,,,,101,54,,,, \ No newline at end of file diff --git a/bmps/nimbus-roman/X.alpha b/bmps/nimbus-roman/X.alpha deleted file mode 100644 index 4f89c15..0000000 --- a/bmps/nimbus-roman/X.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -82,205,255,255,139,37,,23,130,255,200,88 -,13,211,255,88,,,,75,195,10, -,,44,247,218,8,,23,196,17,, -,,,118,255,133,4,185,52,,, -,,,4,203,251,174,105,,,, -,,,,46,250,235,8,,,, -,,,,38,234,255,136,,,, -,,,11,200,49,212,253,59,,, -,,,161,93,,55,252,215,9,, -,,110,151,,,,149,255,137,, -,76,226,10,,,,18,245,252,68, -118,244,231,112,2,,12,109,242,255,240,118 \ No newline at end of file diff --git a/bmps/nimbus-roman/Y.alpha b/bmps/nimbus-roman/Y.alpha deleted file mode 100644 index dca3c15..0000000 --- a/bmps/nimbus-roman/Y.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -123,247,255,224,91,,,,89,218,242,122 -,104,255,229,7,,,,3,216,76, -,,168,255,129,,,,111,133,, -,,15,226,249,45,,26,202,7,, -,,,67,254,206,4,170,66,,, -,,,,156,255,174,153,,,, -,,,,15,236,250,16,,,, -,,,,,213,245,,,,, -,,,,,213,245,,,,, -,,,,,213,245,,,,, -,,,,,228,252,3,,,, -,,,59,141,255,255,156,74,,, \ No newline at end of file diff --git a/bmps/nimbus-roman/Z.alpha b/bmps/nimbus-roman/Z.alpha deleted file mode 100644 index 4990257..0000000 --- a/bmps/nimbus-roman/Z.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -87,255,218,180,170,170,170,227,255,124 -115,117,,,,,39,246,209,6 -131,5,,,,2,195,251,52, -15,,,,,117,255,131,, -,,,,40,247,213,7,, -,,,4,201,251,52,,, -,,,124,255,130,,,, -,,42,247,213,8,,,, -,5,206,251,51,,,,,21 -,128,255,131,,,,,,139 -49,250,211,7,,,,,59,194 -210,255,205,170,170,170,174,203,253,168 \ No newline at end of file diff --git a/bmps/nimbus-roman/[.alpha b/bmps/nimbus-roman/[.alpha deleted file mode 100644 index b5a6aa7..0000000 --- a/bmps/nimbus-roman/[.alpha +++ /dev/null @@ -1,16 +0,0 @@ -0 -255,212,121,119 -255,115,, -255,113,, -255,113,, -255,113,, -255,113,, -255,113,, -255,113,, -255,113,, -255,113,, -255,113,, -255,113,, -255,113,, -255,119,, -255,221,124,119 \ No newline at end of file diff --git a/bmps/nimbus-roman/].alpha b/bmps/nimbus-roman/].alpha deleted file mode 100644 index dfe4369..0000000 --- a/bmps/nimbus-roman/].alpha +++ /dev/null @@ -1,16 +0,0 @@ -0 -119,124,221,255 -,,120,255 -,,113,255 -,,113,255 -,,113,255 -,,113,255 -,,113,255 -,,113,255 -,,113,255 -,,113,255 -,,113,255 -,,113,255 -,,113,255 -,,116,255 -119,122,213,255 \ No newline at end of file diff --git a/bmps/nimbus-roman/^.alpha b/bmps/nimbus-roman/^.alpha deleted file mode 100644 index fc9b831..0000000 --- a/bmps/nimbus-roman/^.alpha +++ /dev/null @@ -1,7 +0,0 @@ -0 -,,59,255,63,, -,,190,182,190,, -,59,220,7,217,63, -,191,97,,96,190, -60,224,6,,3,218,63 -191,98,,,,98,191 \ No newline at end of file diff --git a/bmps/nimbus-roman/_.alpha b/bmps/nimbus-roman/_.alpha deleted file mode 100644 index 4a05619..0000000 --- a/bmps/nimbus-roman/_.alpha +++ /dev/null @@ -1,4 +0,0 @@ -9 -,,,,,,,, -,,,,,,,, -255,255,255,255,255,255,255,255,255 \ No newline at end of file diff --git a/bmps/nimbus-roman/`.alpha b/bmps/nimbus-roman/`.alpha deleted file mode 100644 index b94dabf..0000000 --- a/bmps/nimbus-roman/`.alpha +++ /dev/null @@ -1,4 +0,0 @@ -0 -219,115,, -67,221,122, -,9,128,129 \ No newline at end of file diff --git a/bmps/nimbus-roman/a.alpha b/bmps/nimbus-roman/a.alpha deleted file mode 100644 index a45fd17..0000000 --- a/bmps/nimbus-roman/a.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -11,144,116,122,183,27, -138,205,,,188,145, -69,94,,,179,179, -,9,91,102,201,184, -50,197,40,,173,184, -213,146,,,175,184, -238,200,14,56,217,206,20 -101,238,211,86,103,242,142 \ No newline at end of file diff --git a/bmps/nimbus-roman/b.alpha b/bmps/nimbus-roman/b.alpha deleted file mode 100644 index 4c26271..0000000 --- a/bmps/nimbus-roman/b.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -97,175,139,,,,, -22,241,148,,,,, -,220,148,,,,, -,220,148,,18,9,, -,220,158,172,251,249,146,4 -,220,216,39,5,124,255,110 -,220,151,,,1,218,210 -,220,148,,,,166,246 -,220,148,,,,140,228 -,220,148,,,,169,151 -,219,157,,,31,219,25 -,79,194,172,144,145,30, \ No newline at end of file diff --git a/bmps/nimbus-roman/c.alpha b/bmps/nimbus-roman/c.alpha deleted file mode 100644 index 2768241..0000000 --- a/bmps/nimbus-roman/c.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -,33,140,125,171,169,23 -38,216,22,,16,245,162 -169,138,,,,67,47 -237,110,,,,, -242,142,,,,, -197,235,17,,,,86 -74,255,216,96,70,152,66 -,81,216,246,197,65, \ No newline at end of file diff --git a/bmps/nimbus-roman/d.alpha b/bmps/nimbus-roman/d.alpha deleted file mode 100644 index a4cef92..0000000 --- a/bmps/nimbus-roman/d.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,,,71,158,193, -,,,,10,186,215, -,,,,,153,215, -,,3,26,3,153,215, -,77,175,105,142,207,215, -42,230,12,,,196,215, -168,156,,,,154,215, -223,131,,,,153,215, -243,150,,,,153,215, -206,217,1,,,153,216, -97,255,133,8,21,212,244,52 -1,111,218,238,159,149,161,71 \ No newline at end of file diff --git a/bmps/nimbus-roman/e.alpha b/bmps/nimbus-roman/e.alpha deleted file mode 100644 index 0f38b2a..0000000 --- a/bmps/nimbus-roman/e.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -,60,136,158,206,85, -59,163,,,111,254,54 -183,158,102,102,130,255,138 -240,102,34,34,34,34,22 -243,115,,,,, -204,212,5,,,,105 -96,255,182,66,64,160,57 -1,108,216,243,191,58, \ No newline at end of file diff --git a/bmps/nimbus-roman/f.alpha b/bmps/nimbus-roman/f.alpha deleted file mode 100644 index e8bba8a..0000000 --- a/bmps/nimbus-roman/f.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,90,118,220,157 -,36,203,,54,164 -,120,189,,, -,149,189,,, -151,217,230,153,119, -,160,194,,, -,160,194,,, -,160,194,,, -,160,194,,, -,160,194,,, -,168,199,,, -87,232,246,100,20, \ No newline at end of file diff --git a/bmps/nimbus-roman/g.alpha b/bmps/nimbus-roman/g.alpha deleted file mode 100644 index 5f4f3e0..0000000 --- a/bmps/nimbus-roman/g.alpha +++ /dev/null @@ -1,13 +0,0 @@ -4 -,31,153,127,181,163,113,102 -4,210,94,,23,246,184,68 -45,255,72,,,176,205, -41,255,115,,,149,178, -,156,227,38,16,201,51, -,18,153,116,100,23,, -8,200,39,,,,, -18,230,255,253,238,226,176,35 -7,130,56,72,92,114,146,170 -177,90,,,,,,123 -229,191,52,11,15,54,136,43 -49,181,236,247,212,133,21, \ No newline at end of file diff --git a/bmps/nimbus-roman/h.alpha b/bmps/nimbus-roman/h.alpha deleted file mode 100644 index bd662f9..0000000 --- a/bmps/nimbus-roman/h.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -96,180,115,,,,, -34,251,122,,,,, -,237,122,,,,, -,237,122,,9,3,, -,237,127,158,234,243,79, -,237,203,39,1,177,211, -,237,122,,,111,247, -,237,122,,,105,254, -,237,122,,,105,254, -,237,122,,,105,254, -,243,127,,,111,255,3 -110,255,207,49,43,199,255,120 \ No newline at end of file diff --git a/bmps/nimbus-roman/i.alpha b/bmps/nimbus-roman/i.alpha deleted file mode 100644 index 9753630..0000000 --- a/bmps/nimbus-roman/i.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,186,138, -,137,99, -,,, -,,3, -69,164,182, -26,205,191, -,171,191, -,170,191, -,170,191, -,170,191, -,177,196, -88,235,242,92 \ No newline at end of file diff --git a/bmps/nimbus-roman/j.alpha b/bmps/nimbus-roman/j.alpha deleted file mode 100644 index 2c0b3bb..0000000 --- a/bmps/nimbus-roman/j.alpha +++ /dev/null @@ -1,17 +0,0 @@ -2 -,,,180,196 -,,,137,148 -,,,, -,,,,1 -,1,68,151,226 -,3,40,199,250 -,,,156,250 -,,,155,250 -,,,155,250 -,,,155,250 -,,,155,250 -,,,155,250 -,,,155,243 -,,,161,207 -129,71,,184,115 -164,242,143,127,3 \ No newline at end of file diff --git a/bmps/nimbus-roman/k.alpha b/bmps/nimbus-roman/k.alpha deleted file mode 100644 index ba33eb7..0000000 --- a/bmps/nimbus-roman/k.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -91,162,200,,,,,, -11,199,223,,,,,, -,165,223,,,,,, -,164,223,,,,,, -,164,223,,9,136,225,116,44 -,164,223,,27,172,41,, -,164,223,46,149,13,,, -,164,233,235,125,,,, -,164,223,108,254,84,,, -,164,223,,162,243,44,, -,167,224,,12,214,219,27, -92,227,249,100,16,127,255,224,105 \ No newline at end of file diff --git a/bmps/nimbus-roman/l.alpha b/bmps/nimbus-roman/l.alpha deleted file mode 100644 index ef5f819..0000000 --- a/bmps/nimbus-roman/l.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -95,169,171, -12,205,188, -,172,188, -,171,188, -,171,188, -,171,188, -,171,188, -,171,188, -,171,188, -,171,188, -,175,191, -88,235,238,88 \ No newline at end of file diff --git a/bmps/nimbus-roman/m.alpha b/bmps/nimbus-roman/m.alpha deleted file mode 100644 index 9365eb4..0000000 --- a/bmps/nimbus-roman/m.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -91,176,137,79,211,244,111,25,166,236,208,33, -12,231,207,62,1,124,247,140,15,9,216,149, -,205,162,,,60,255,58,,,165,194, -,204,162,,,54,255,58,,,158,208, -,204,162,,,54,255,58,,,158,208, -,204,162,,,54,255,58,,,158,208, -,208,163,,,57,255,63,,,162,211, -89,247,220,71,27,158,255,166,33,63,222,248,92 \ No newline at end of file diff --git a/bmps/nimbus-roman/n.alpha b/bmps/nimbus-roman/n.alpha deleted file mode 100644 index 44e3d69..0000000 --- a/bmps/nimbus-roman/n.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -98,183,115,109,236,222,58, -20,251,199,57,8,194,197, -,232,133,,,126,239, -,232,133,,,121,245, -,232,133,,,121,245, -,232,133,,,121,245, -,236,134,,,127,247, -99,254,205,57,43,209,255,109 \ No newline at end of file diff --git a/bmps/nimbus-roman/o.alpha b/bmps/nimbus-roman/o.alpha deleted file mode 100644 index 972b153..0000000 --- a/bmps/nimbus-roman/o.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -,56,158,126,156,183,45, -56,239,29,,,126,249,59 -187,184,,,,10,238,192 -244,173,,,,,191,246 -242,202,,,,,169,237 -181,250,23,,,,196,167 -48,245,139,,,42,235,35 -,48,182,164,128,150,37, \ No newline at end of file diff --git a/bmps/nimbus-roman/p.alpha b/bmps/nimbus-roman/p.alpha deleted file mode 100644 index e49212e..0000000 --- a/bmps/nimbus-roman/p.alpha +++ /dev/null @@ -1,13 +0,0 @@ -4 -63,158,151,109,230,231,129,1 -49,235,222,84,32,145,255,103 -,204,168,,,1,219,205 -,203,165,,,,150,243 -,203,165,,,,129,226 -,203,165,,,,154,177 -,203,174,,,6,228,58 -,203,224,126,77,177,114, -,203,165,34,75,27,, -,203,165,,,,, -,206,170,,,,, -106,247,233,100,14,,, \ No newline at end of file diff --git a/bmps/nimbus-roman/q.alpha b/bmps/nimbus-roman/q.alpha deleted file mode 100644 index a86ca2a..0000000 --- a/bmps/nimbus-roman/q.alpha +++ /dev/null @@ -1,13 +0,0 @@ -4 -,41,163,141,136,136,179, -29,229,39,,,175,233, -154,173,,,,138,233, -227,135,,,,136,233, -249,147,,,,136,233, -223,191,,,,137,233, -151,253,68,,6,182,233, -26,216,252,206,178,164,233, -,11,74,53,1,136,233, -,,,,,136,233, -,,,,,143,235, -,,,6,102,230,254,116 \ No newline at end of file diff --git a/bmps/nimbus-roman/r.alpha b/bmps/nimbus-roman/r.alpha deleted file mode 100644 index bb7f4b1..0000000 --- a/bmps/nimbus-roman/r.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -57,146,185,55,226,199 -45,221,230,90,87,138 -,182,218,,, -,181,208,,, -,181,208,,, -,181,208,,, -,185,213,,, -98,239,251,110,25, \ No newline at end of file diff --git a/bmps/nimbus-roman/s.alpha b/bmps/nimbus-roman/s.alpha deleted file mode 100644 index a94a015..0000000 --- a/bmps/nimbus-roman/s.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -62,136,96,156,82 -220,26,,43,106 -237,146,5,,39 -102,254,213,63, -,66,216,252,102 -72,,5,164,240 -181,,,62,208 -197,124,97,147,46 \ No newline at end of file diff --git a/bmps/nimbus-roman/t.alpha b/bmps/nimbus-roman/t.alpha deleted file mode 100644 index 97e9629..0000000 --- a/bmps/nimbus-roman/t.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,15,121,, -10,185,165,, -135,250,213,136,75 -,237,165,, -,237,165,, -,237,165,, -,237,165,, -,237,167,, -,217,206,3,51 -,97,242,201,70 \ No newline at end of file diff --git a/bmps/nimbus-roman/u.alpha b/bmps/nimbus-roman/u.alpha deleted file mode 100644 index b772cbd..0000000 --- a/bmps/nimbus-roman/u.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -99,255,124,,65,203,241, -,243,124,,,125,241, -,241,124,,,124,241, -,241,124,,,124,241, -,241,124,,,124,241, -,240,126,,,128,241, -,205,201,21,58,188,251,35 -,61,220,234,127,97,180,94 \ No newline at end of file diff --git a/bmps/nimbus-roman/v.alpha b/bmps/nimbus-roman/v.alpha deleted file mode 100644 index 60d2b8e..0000000 --- a/bmps/nimbus-roman/v.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -125,255,205,33,,34,207,142 -1,202,213,,,,174,7 -,77,255,59,,42,127, -,2,221,161,,139,30, -,,116,246,24,155,, -,,17,245,192,74,, -,,,154,225,3,, -,,,48,106,,, \ No newline at end of file diff --git a/bmps/nimbus-roman/w.alpha b/bmps/nimbus-roman/w.alpha deleted file mode 100644 index dc85f76..0000000 --- a/bmps/nimbus-roman/w.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -160,255,169,15,63,237,248,89,,14,175,178 -14,241,145,,,120,252,20,,,151,38 -,148,235,7,,59,255,107,,8,166, -,45,255,87,,156,186,206,,94,81, -,,196,187,29,154,56,255,49,173,4, -,,92,253,176,39,,209,196,126,, -,,7,234,168,,,108,251,26,, -,,,117,42,,,15,150,,, \ No newline at end of file diff --git a/bmps/nimbus-roman/x.alpha b/bmps/nimbus-roman/x.alpha deleted file mode 100644 index b4d2753..0000000 --- a/bmps/nimbus-roman/x.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -82,236,254,66,43,238,132,15 -,75,255,88,69,127,, -,,165,226,175,5,, -,,22,238,150,,, -,,48,209,252,54,, -,6,178,15,206,210,5, -,132,73,,54,252,124, -121,237,39,,38,230,252,119 \ No newline at end of file diff --git a/bmps/nimbus-roman/y.alpha b/bmps/nimbus-roman/y.alpha deleted file mode 100644 index 2f27fd1..0000000 --- a/bmps/nimbus-roman/y.alpha +++ /dev/null @@ -1,13 +0,0 @@ -4 -130,255,200,46,,26,187,157 -,207,201,,,,179,14 -,93,255,55,,24,162, -,5,227,165,,108,72, -,,120,250,29,172,4, -,,17,243,161,140,, -,,,140,255,48,, -,,,41,211,,, -,,,83,115,,, -,,,170,18,,, -110,185,165,134,,,, -114,243,166,9,,,, \ No newline at end of file diff --git a/bmps/nimbus-roman/z.alpha b/bmps/nimbus-roman/z.alpha deleted file mode 100644 index 4f442f8..0000000 --- a/bmps/nimbus-roman/z.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -126,183,136,136,183,255,140 -107,2,,8,215,220,11 -6,,,137,253,62, -,,55,252,143,, -,7,212,221,12,, -,133,253,60,,,41 -51,251,143,,,,133 -210,254,146,136,141,176,202 \ No newline at end of file diff --git a/bmps/nimbus-roman/{.alpha b/bmps/nimbus-roman/{.alpha deleted file mode 100644 index b16f9f0..0000000 --- a/bmps/nimbus-roman/{.alpha +++ /dev/null @@ -1,17 +0,0 @@ -0 -,,101,191,85 -,31,253,87, -,70,255,49, -,77,255,46, -,77,255,46, -,77,255,44, -,98,252,19, -49,193,114,, -45,191,115,, -,97,253,19, -,77,255,44, -,77,255,46, -,77,255,46, -,70,255,49, -,28,251,88, -,,97,189,85 \ No newline at end of file diff --git a/bmps/nimbus-roman/|.alpha b/bmps/nimbus-roman/|.alpha deleted file mode 100644 index 8da9a62..0000000 --- a/bmps/nimbus-roman/|.alpha +++ /dev/null @@ -1,15 +0,0 @@ -0 -255 -255 -255 -255 -255 -255 -255 -255 -255 -255 -255 -255 -255 -255 \ No newline at end of file diff --git a/bmps/nimbus-roman/}.alpha b/bmps/nimbus-roman/}.alpha deleted file mode 100644 index 4b33717..0000000 --- a/bmps/nimbus-roman/}.alpha +++ /dev/null @@ -1,17 +0,0 @@ -0 -86,192,99,, -,91,252,28, -,50,255,69, -,46,255,77, -,46,255,77, -,44,255,77, -,21,253,96, -,,115,191,49 -,,117,192,45 -,21,253,96, -,44,255,77, -,46,255,77, -,46,255,77, -,50,255,70, -,91,252,29, -86,191,98,, \ No newline at end of file diff --git a/bmps/nimbus-roman/~.alpha b/bmps/nimbus-roman/~.alpha deleted file mode 100644 index 0d5fccc..0000000 --- a/bmps/nimbus-roman/~.alpha +++ /dev/null @@ -1,4 +0,0 @@ -5 -18,189,244,193,66,,,46,64 -180,221,127,185,255,185,128,223,178 -64,45,,,67,195,244,187,16 \ No newline at end of file diff --git a/bmps/nimbus-roman/𐘅.alpha b/bmps/nimbus-roman/𐘅.alpha deleted file mode 100644 index daf548f..0000000 --- a/bmps/nimbus-roman/𐘅.alpha +++ /dev/null @@ -1,3 +0,0 @@ -9 -196,192 -197,194 \ No newline at end of file diff --git a/bmps/nimbus-roman/𐘋.alpha b/bmps/nimbus-roman/𐘋.alpha deleted file mode 100644 index c7952ed..0000000 --- a/bmps/nimbus-roman/𐘋.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,,76,213 -,,,158,131 -,,3,235,50 -,,67,223,1 -,,149,140, -,2,229,59, -,59,232,2, -,141,150,, -,221,69,, -50,239,6,, -132,159,,, -214,78,,, \ No newline at end of file diff --git a/bmps/nimbus-roman/𐚆.alpha b/bmps/nimbus-roman/𐚆.alpha deleted file mode 100644 index eca63a2..0000000 --- a/bmps/nimbus-roman/𐚆.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -214,75,,, -132,157,,, -50,236,4,, -,221,67,, -,141,149,, -,60,231,2, -,2,230,58, -,,151,140, -,,69,223,1 -,,5,237,50 -,,,160,132 -,,,79,217 \ No newline at end of file diff --git a/bmps/nimbus-romono/!.alpha b/bmps/nimbus-romono/!.alpha deleted file mode 100644 index 25afd84..0000000 --- a/bmps/nimbus-romono/!.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -189,179 -247,241 -220,222 -190,190 -159,159 -126,127 -93,95 -66,63 -34,27 -, -161,149 -192,195 \ No newline at end of file diff --git "a/bmps/nimbus-romono/\".alpha" "b/bmps/nimbus-romono/\".alpha" deleted file mode 100644 index 9702942..0000000 --- "a/bmps/nimbus-romono/\".alpha" +++ /dev/null @@ -1,6 +0,0 @@ -0 -202,122,,121,202 -230,145,,146,229 -191,108,,108,192 -153,71,,69,154 -114,32,,30,116 \ No newline at end of file diff --git a/bmps/nimbus-romono/#.alpha b/bmps/nimbus-romono/#.alpha deleted file mode 100644 index 204495f..0000000 --- a/bmps/nimbus-romono/#.alpha +++ /dev/null @@ -1,12 +0,0 @@ -1 -,,53,188,,28,213, -,,92,149,,66,175, -,,130,111,,103,138, -95,170,222,199,170,212,208,170 -38,68,222,91,68,201,112,68 -,1,237,4,,214,27, -136,144,240,136,136,247,137,81 -102,148,201,102,128,221,102,61 -,108,133,,73,168,, -,145,96,,109,132,, -,183,58,,144,97,, \ No newline at end of file diff --git a/bmps/nimbus-romono/$.alpha b/bmps/nimbus-romono/$.alpha deleted file mode 100644 index dfe1689..0000000 --- a/bmps/nimbus-romono/$.alpha +++ /dev/null @@ -1,15 +0,0 @@ -2 -,,,147,,, -2,113,144,200,133,128,15 -120,164,,151,,114,117 -204,110,,151,,3,91 -176,214,28,151,,, -39,238,231,180,,, -,38,196,255,187,35, -,,1,190,232,243,55 -,,,147,24,218,210 -55,,,147,,105,246 -171,,,147,,111,201 -216,129,21,149,64,203,52 -2,67,107,198,80,12, -,,,147,,, \ No newline at end of file diff --git a/bmps/nimbus-romono/%.alpha b/bmps/nimbus-romono/%.alpha deleted file mode 100644 index 25ddea2..0000000 --- a/bmps/nimbus-romono/%.alpha +++ /dev/null @@ -1,12 +0,0 @@ -1 -,19,145,140,91,1,13,115,145,, -20,222,88,,123,97,100,181,24,, -150,189,,,105,,57,130,,, -223,95,,,113,,173,14,,, -238,59,,68,65,79,109,,5,24, -117,171,114,92,3,179,6,80,197,115,132 -,25,10,,100,88,60,247,34,,108 -,,,10,177,1,189,156,,,113 -,,,122,67,,239,84,,6,114 -,,20,169,,,214,70,,110,26 -,,142,48,,,55,155,114,37, \ No newline at end of file diff --git a/bmps/nimbus-romono/&.alpha b/bmps/nimbus-romono/&.alpha deleted file mode 100644 index b4a2491..0000000 --- a/bmps/nimbus-romono/&.alpha +++ /dev/null @@ -1,12 +0,0 @@ -1 -,,,127,144,155,76,,,, -,,72,201,,4,206,,,, -,,122,205,,14,209,,,, -,,90,251,41,171,77,,,, -,,27,254,207,39,,116,255,176,39 -,58,179,183,241,21,,25,204,4, -58,213,18,30,247,155,,118,56,, -198,126,,,131,254,111,133,,, -245,138,,,6,204,255,55,,, -203,237,43,,41,171,222,236,87,49,126 -44,194,245,202,147,19,20,176,246,198,36 \ No newline at end of file diff --git a/bmps/nimbus-romono/'.alpha b/bmps/nimbus-romono/'.alpha deleted file mode 100644 index 172c56b..0000000 --- a/bmps/nimbus-romono/'.alpha +++ /dev/null @@ -1,5 +0,0 @@ -0 -203 -207 -151 -94 \ No newline at end of file diff --git a/bmps/nimbus-romono/(.alpha b/bmps/nimbus-romono/(.alpha deleted file mode 100644 index 7d540a3..0000000 --- a/bmps/nimbus-romono/(.alpha +++ /dev/null @@ -1,17 +0,0 @@ -0 -,,,33,119 -,,59,154,6 -,39,210,11, -1,203,100,, -78,254,24,, -166,219,,, -223,199,,, -246,181,,, -244,183,,, -220,200,,, -159,225,,, -68,255,31,, -,188,103,, -,26,192,7, -,,52,151,6 -,,,42,127 \ No newline at end of file diff --git a/bmps/nimbus-romono/).alpha b/bmps/nimbus-romono/).alpha deleted file mode 100644 index 12658ef..0000000 --- a/bmps/nimbus-romono/).alpha +++ /dev/null @@ -1,17 +0,0 @@ -0 -127,42,,, -6,151,52,, -,7,193,26, -,,103,187, -,,31,255,67 -,,,226,158 -,,,201,219 -,,,184,243 -,,,181,245 -,,,200,221 -,,,221,163 -,,26,254,75 -,,101,200,1 -,12,212,38, -6,156,58,, -119,33,,, \ No newline at end of file diff --git a/bmps/nimbus-romono/*.alpha b/bmps/nimbus-romono/*.alpha deleted file mode 100644 index ac5fa00..0000000 --- a/bmps/nimbus-romono/*.alpha +++ /dev/null @@ -1,8 +0,0 @@ -0 -,,117,123,, -109,17,103,108,24,112 -156,190,82,78,196,157 -,15,163,158,9, -152,190,72,70,193,158 -108,21,103,106,21,107 -,,122,121,, \ No newline at end of file diff --git a/bmps/nimbus-romono/+.alpha b/bmps/nimbus-romono/+.alpha deleted file mode 100644 index 371d9a5..0000000 --- a/bmps/nimbus-romono/+.alpha +++ /dev/null @@ -1,9 +0,0 @@ -2 -,,,134,134,,, -,,,134,134,,, -,,,134,134,,, -134,134,134,197,197,134,134,134 -134,134,134,197,197,134,134,134 -,,,134,134,,, -,,,134,134,,, -,,,134,134,,, \ No newline at end of file diff --git a/bmps/nimbus-romono/,.alpha b/bmps/nimbus-romono/,.alpha deleted file mode 100644 index 33949a6..0000000 --- a/bmps/nimbus-romono/,.alpha +++ /dev/null @@ -1,6 +0,0 @@ -9 -176,240,100 -226,255,237 -17,48,199 -,97,94 -79,99, \ No newline at end of file diff --git a/bmps/nimbus-romono/-.alpha b/bmps/nimbus-romono/-.alpha deleted file mode 100644 index e967781..0000000 --- a/bmps/nimbus-romono/-.alpha +++ /dev/null @@ -1,2 +0,0 @@ -8 -255,255,255,255 \ No newline at end of file diff --git a/bmps/nimbus-romono/0.alpha b/bmps/nimbus-romono/0.alpha deleted file mode 100644 index 3341552..0000000 --- a/bmps/nimbus-romono/0.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,16,149,125,133,152,14, -2,191,126,,,141,197,1 -80,255,32,,,182,255,91 -168,227,,,59,254,243,171 -224,202,,2,204,237,207,223 -247,187,,101,255,104,187,247 -244,185,13,230,213,4,185,245 -218,200,138,255,70,,201,220 -164,227,248,175,,,225,166 -79,255,250,38,,29,255,78 -2,214,179,,,123,190,2 -,18,155,132,126,148,16, \ No newline at end of file diff --git a/bmps/nimbus-romono/1.alpha b/bmps/nimbus-romono/1.alpha deleted file mode 100644 index abe291a..0000000 --- a/bmps/nimbus-romono/1.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,40,167,80, -89,172,255,82, -,53,255,82, -,51,255,82, -,51,255,82, -,51,255,82, -,51,255,82, -,51,255,82, -,51,255,82, -,51,255,82, -,58,255,83, -68,177,255,179,75 \ No newline at end of file diff --git a/bmps/nimbus-romono/2.alpha b/bmps/nimbus-romono/2.alpha deleted file mode 100644 index 0a55938..0000000 --- a/bmps/nimbus-romono/2.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,54,186,240,221,124,5, -39,197,98,102,198,255,137, -142,19,,,5,212,240,2 -67,,,,,135,254,9 -,,,,,144,207, -,,,,1,217,89, -,,,,89,168,, -,,,29,172,8,, -,,15,153,14,,, -,12,149,17,,,,47 -8,180,105,85,85,85,106,140 -180,255,255,255,255,255,255,55 \ No newline at end of file diff --git a/bmps/nimbus-romono/3.alpha b/bmps/nimbus-romono/3.alpha deleted file mode 100644 index a3a1510..0000000 --- a/bmps/nimbus-romono/3.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,77,203,245,217,91, -77,132,28,35,178,252,42 -88,,,,31,255,88 -,,,,45,239,25 -,,,10,170,52, -,1,108,219,255,205,27 -,,7,34,144,255,168 -,,,,,165,236 -,,,,,89,239 -,,,,,112,168 -123,83,1,,21,190,29 -160,242,203,126,107,16, \ No newline at end of file diff --git a/bmps/nimbus-romono/4.alpha b/bmps/nimbus-romono/4.alpha deleted file mode 100644 index 7566ecb..0000000 --- a/bmps/nimbus-romono/4.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,,,10,216,58, -,,,,144,255,58, -,,,68,132,255,58, -,,16,156,34,255,58, -,,151,28,33,255,58, -,82,87,,33,255,58, -26,147,,,33,255,58, -169,52,34,34,62,255,84,34 -255,255,255,255,255,255,255,255 -17,17,17,17,44,255,71,17 -,,,,29,255,58, -,,,,29,255,58, \ No newline at end of file diff --git a/bmps/nimbus-romono/5.alpha b/bmps/nimbus-romono/5.alpha deleted file mode 100644 index a7664a8..0000000 --- a/bmps/nimbus-romono/5.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,93,136,136,136,144 -,20,220,204,204,204,90 -,129,59,,,, -11,229,149,85,15,, -62,217,252,255,239,85, -,,11,102,232,251,55 -,,,,31,240,164 -,,,,,146,197 -,,,,,116,180 -,,,,,158,106 -146,112,5,,52,182,6 -152,240,209,135,107,5, \ No newline at end of file diff --git a/bmps/nimbus-romono/6.alpha b/bmps/nimbus-romono/6.alpha deleted file mode 100644 index c79d359..0000000 --- a/bmps/nimbus-romono/6.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,,5,92,144,107,51 -,,48,215,150,14,, -,65,244,118,,,, -21,231,198,1,,,, -125,255,106,108,143,110,21, -208,255,127,59,85,217,234,42 -241,206,,,,34,252,179 -244,190,,,,,201,234 -206,214,,,,,176,243 -127,250,23,,,,195,185 -16,224,146,,,30,244,56 -,29,165,158,128,160,59, \ No newline at end of file diff --git a/bmps/nimbus-romono/7.alpha b/bmps/nimbus-romono/7.alpha deleted file mode 100644 index 81fc159..0000000 --- a/bmps/nimbus-romono/7.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -56,255,255,255,255,255,236 -145,119,85,85,85,152,163 -87,,,,,164,88 -,,,,3,232,17 -,,,,65,191, -,,,,142,116, -,,,,218,41, -,,,41,222,, -,,,119,145,, -,,,196,70,, -,,19,240,7,, -,,95,174,,, \ No newline at end of file diff --git a/bmps/nimbus-romono/8.alpha b/bmps/nimbus-romono/8.alpha deleted file mode 100644 index 7ec6f17..0000000 --- a/bmps/nimbus-romono/8.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -2,113,139,127,168,107, -122,167,,,6,220,85 -210,128,,,,168,146 -196,223,18,,4,219,89 -60,248,212,54,161,120, -,66,241,255,150,1, -,93,152,204,255,166,3 -102,192,1,6,148,255,133 -232,108,,,,175,234 -234,113,,,,104,231 -145,203,6,,,162,141 -7,127,174,129,141,123,6 \ No newline at end of file diff --git a/bmps/nimbus-romono/9.alpha b/bmps/nimbus-romono/9.alpha deleted file mode 100644 index b3a2924..0000000 --- a/bmps/nimbus-romono/9.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,71,149,129,176,51, -57,223,4,,61,240,24 -183,157,,,,218,138 -233,134,,,,174,208 -239,154,,,,155,242 -188,224,3,,,153,237 -57,243,165,64,108,221,203 -,37,116,113,44,238,126 -,,,,99,241,25 -,,,32,239,97, -,,56,218,103,, -55,126,137,37,,, \ No newline at end of file diff --git a/bmps/nimbus-romono/:.alpha b/bmps/nimbus-romono/:.alpha deleted file mode 100644 index 0223dc1..0000000 --- a/bmps/nimbus-romono/:.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -199,195 -159,162 -, -, -, -, -171,167 -194,190 \ No newline at end of file diff --git a/bmps/nimbus-romono/;.alpha b/bmps/nimbus-romono/;.alpha deleted file mode 100644 index ef011e2..0000000 --- a/bmps/nimbus-romono/;.alpha +++ /dev/null @@ -1,12 +0,0 @@ -4 -177,235,49 -188,242,55 -,, -,, -,, -,, -59,102,18 -240,255,201 -76,127,221 -,63,124 -70,112,1 \ No newline at end of file diff --git a/bmps/nimbus-romono/<.alpha b/bmps/nimbus-romono/<.alpha deleted file mode 100644 index 207ac90..0000000 --- a/bmps/nimbus-romono/<.alpha +++ /dev/null @@ -1,8 +0,0 @@ -2 -,,,,13,126,174 -,,6,102,231,187,50 -4,98,225,194,60,, -135,255,172,4,,, -,56,197,217,85,, -,,1,85,222,190,49 -,,,,9,121,175 \ No newline at end of file diff --git a/bmps/nimbus-romono/=.alpha b/bmps/nimbus-romono/=.alpha deleted file mode 100644 index 6a5f12e..0000000 --- a/bmps/nimbus-romono/=.alpha +++ /dev/null @@ -1,5 +0,0 @@ -4 -254,254,254,254,254,254,254,254 -,,,,,,, -,,,,,,, -254,254,254,254,254,254,254,254 \ No newline at end of file diff --git a/bmps/nimbus-romono/>.alpha b/bmps/nimbus-romono/>.alpha deleted file mode 100644 index c32bb44..0000000 --- a/bmps/nimbus-romono/>.alpha +++ /dev/null @@ -1,8 +0,0 @@ -2 -174,126,13,,,, -43,170,235,119,8,, -,,60,194,225,98,4 -,,,4,172,255,135 -,,68,210,204,63, -42,182,227,102,2,, -175,121,9,,,, \ No newline at end of file diff --git a/bmps/nimbus-romono/?.alpha b/bmps/nimbus-romono/?.alpha deleted file mode 100644 index 857afc5..0000000 --- a/bmps/nimbus-romono/?.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -24,124,131,183,137,10 -173,8,,13,227,169 -241,95,,,163,242 -116,54,,,180,218 -,,,5,237,112 -,,,77,195,4 -,,,167,27, -,,11,116,, -,,48,45,, -,,,,, -,,155,130,, -,,194,169,, \ No newline at end of file diff --git a/bmps/nimbus-romono/@.alpha b/bmps/nimbus-romono/@.alpha deleted file mode 100644 index dce7635..0000000 --- a/bmps/nimbus-romono/@.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,2,88,158,141,138,145,144,40,, -,18,189,130,6,,,,21,162,94, -3,194,147,,,,5,2,,1,170,55 -99,243,18,,5,146,220,178,178,101,27,174 -194,174,,,141,193,12,44,255,56,,185 -240,130,,25,248,36,,57,242,4,,170 -244,124,,92,221,,,121,181,,2,166 -204,160,,104,217,,13,223,120,,89,81 -113,235,11,33,241,161,117,142,182,117,119,1 -7,207,149,,24,44,,1,53,33,, -,25,199,162,25,,,,12,90,4, -,,4,93,181,180,174,167,149,61,1, \ No newline at end of file diff --git a/bmps/nimbus-romono/A.alpha b/bmps/nimbus-romono/A.alpha deleted file mode 100644 index a640ed4..0000000 --- a/bmps/nimbus-romono/A.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,,,95,69,,,, -,,,,182,160,,,, -,,,19,231,242,10,,, -,,,104,86,252,87,,, -,,,166,2,191,178,,, -,,25,140,,104,250,20,, -,,112,56,,20,251,104,, -,,196,154,153,153,237,196,, -,33,151,34,34,34,123,254,33, -,131,59,,,,23,252,123, -5,218,2,,,,,205,221,4 -153,249,98,,,,71,221,255,146 \ No newline at end of file diff --git a/bmps/nimbus-romono/B.alpha b/bmps/nimbus-romono/B.alpha deleted file mode 100644 index 987e787..0000000 --- a/bmps/nimbus-romono/B.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -102,211,255,219,172,181,208,136,25, -,96,255,113,,,38,232,224,13 -,85,255,112,,,,125,255,85 -,85,255,112,,,,109,255,85 -,85,255,112,,,12,203,230,17 -,85,255,198,153,176,235,175,27, -,85,255,127,34,57,126,242,189,22 -,85,255,112,,,,81,255,170 -,85,255,112,,,,8,255,240 -,85,255,112,,,,29,255,215 -,97,255,115,,,9,167,255,96 -101,211,255,235,179,192,215,188,88, \ No newline at end of file diff --git a/bmps/nimbus-romono/C.alpha b/bmps/nimbus-romono/C.alpha deleted file mode 100644 index ee2c874..0000000 --- a/bmps/nimbus-romono/C.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,10,111,197,195,180,191,160,127,150 -,35,215,208,41,,,,85,237,169 -11,221,235,23,,,,,,73,179 -121,255,130,,,,,,,,137 -204,255,62,,,,,,,, -241,255,34,,,,,,,, -246,255,40,,,,,,,, -214,255,72,,,,,,,, -138,255,143,,,,,,,, -24,236,243,33,,,,,,,68 -,59,234,223,79,,,,33,150,78 -,,22,132,208,230,196,175,137,26, \ No newline at end of file diff --git a/bmps/nimbus-romono/D.alpha b/bmps/nimbus-romono/D.alpha deleted file mode 100644 index d794b20..0000000 --- a/bmps/nimbus-romono/D.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -106,219,255,230,180,191,206,170,88,4,, -,117,255,109,,,3,89,239,209,36, -,108,255,104,,,,,47,246,224,17 -,108,255,104,,,,,,132,255,129 -,108,255,104,,,,,,43,255,210 -,108,255,104,,,,,,5,253,245 -,108,255,104,,,,,,3,252,241 -,108,255,104,,,,,,29,255,201 -,108,255,104,,,,,,105,255,116 -,108,255,104,,,,,21,230,218,10 -,120,255,111,,,3,73,220,210,36, -107,223,255,232,179,189,203,175,91,6,, \ No newline at end of file diff --git a/bmps/nimbus-romono/E.alpha b/bmps/nimbus-romono/E.alpha deleted file mode 100644 index 20846a9..0000000 --- a/bmps/nimbus-romono/E.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -109,232,255,206,170,170,182,218,255,23 -,144,255,61,,,,,170,28 -,130,255,59,,,,,57,19 -,130,255,59,,,,30,14, -,130,255,59,,,,125,35, -,130,255,190,170,170,190,251,35, -,130,255,72,17,17,37,185,35, -,130,255,59,,,,70,28, -,130,255,59,,,,,,8 -,130,255,59,,,,,,161 -,145,255,61,,,,5,135,155 -110,233,255,224,183,172,191,236,255,91 \ No newline at end of file diff --git a/bmps/nimbus-romono/F.alpha b/bmps/nimbus-romono/F.alpha deleted file mode 100644 index 4e0af08..0000000 --- a/bmps/nimbus-romono/F.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -110,234,255,202,170,170,184,225,245 -,149,255,49,,,,2,193 -,136,255,47,,,,,75 -,136,255,47,,,,44, -,136,255,47,,,,160, -,136,255,186,170,172,208,222, -,136,255,61,17,18,52,196, -,136,255,47,,,,97, -,136,255,47,,,,, -,137,255,47,,,,, -,150,255,58,,,,, -110,233,255,189,70,,,, \ No newline at end of file diff --git a/bmps/nimbus-romono/G.alpha b/bmps/nimbus-romono/G.alpha deleted file mode 100644 index ba9a7b6..0000000 --- a/bmps/nimbus-romono/G.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,59,183,197,182,182,131,158, -,91,244,79,,,18,186,195, -33,245,120,,,,,19,188, -141,252,19,,,,,,80, -211,224,,,,,,,, -244,193,,,,,71,102,102,96 -249,187,,,,,1,163,255,28 -225,218,,,,,,121,247, -162,250,16,,,,,119,246, -50,252,123,,,,,119,246, -,104,248,94,,,,158,237, -,,56,174,201,178,175,141,33, \ No newline at end of file diff --git a/bmps/nimbus-romono/H.alpha b/bmps/nimbus-romono/H.alpha deleted file mode 100644 index aabd139..0000000 --- a/bmps/nimbus-romono/H.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -115,246,251,123,6,6,121,251,246,116 -,191,207,,,,,208,190, -,181,199,,,,,199,181, -,181,199,,,,,199,181, -,181,199,,,,,199,181, -,181,229,136,136,136,136,229,181, -,181,214,68,68,68,68,214,181, -,181,199,,,,,199,181, -,181,199,,,,,199,181, -,181,199,,,,,199,181, -,193,209,,,,,211,191, -116,247,252,124,6,6,122,252,247,117 \ No newline at end of file diff --git a/bmps/nimbus-romono/I.alpha b/bmps/nimbus-romono/I.alpha deleted file mode 100644 index d0061b5..0000000 --- a/bmps/nimbus-romono/I.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -103,213,255,212,100 -,104,255,101, -,94,255,90, -,94,255,90, -,94,255,90, -,94,255,90, -,94,255,90, -,94,255,90, -,94,255,90, -,94,255,90, -,105,255,102, -101,213,255,214,101 \ No newline at end of file diff --git a/bmps/nimbus-romono/J.alpha b/bmps/nimbus-romono/J.alpha deleted file mode 100644 index f034010..0000000 --- a/bmps/nimbus-romono/J.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,77,194,255,223,104 -,,69,255,128, -,,60,255,119, -,,60,255,119, -,,60,255,119, -,,60,255,119, -,,60,255,119, -,,60,255,119, -,,60,255,114, -13,2,60,255,86, -225,143,76,241,18, -147,235,173,68,, \ No newline at end of file diff --git a/bmps/nimbus-romono/K.alpha b/bmps/nimbus-romono/K.alpha deleted file mode 100644 index fa7857d..0000000 --- a/bmps/nimbus-romono/K.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -114,246,251,122,10,49,194,252,136,28 -,188,208,,,1,191,93,, -,177,200,,,112,127,,, -,177,200,,75,172,2,,, -,177,200,52,203,14,,,, -,177,224,233,155,,,,, -,177,229,170,255,86,,,, -,177,200,8,201,243,39,,, -,177,200,,30,238,204,7,, -,178,200,,,85,255,147,, -,190,209,,,,189,255,98, -116,246,252,123,8,36,179,255,249,121 \ No newline at end of file diff --git a/bmps/nimbus-romono/L.alpha b/bmps/nimbus-romono/L.alpha deleted file mode 100644 index 4448931..0000000 --- a/bmps/nimbus-romono/L.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -109,232,255,196,80,,,,, -,144,255,70,,,,,, -,131,255,58,,,,,, -,131,255,58,,,,,, -,131,255,58,,,,,, -,131,255,58,,,,,, -,131,255,58,,,,,, -,131,255,58,,,,,, -,131,255,58,,,,,,15 -,131,255,58,,,,,,153 -,145,255,61,,,,8,137,145 -110,233,255,228,190,187,198,241,255,79 \ No newline at end of file diff --git a/bmps/nimbus-romono/M.alpha b/bmps/nimbus-romono/M.alpha deleted file mode 100644 index 826ca61..0000000 --- a/bmps/nimbus-romono/M.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -117,254,128,,,,,123,255,138 -,227,203,,,,,190,254,3 -,219,254,27,,,16,185,249, -,132,229,100,,,85,116,249, -,131,156,175,,,140,60,249, -,131,81,244,8,1,139,57,249, -,131,11,248,72,47,92,57,249, -,131,,185,147,117,22,57,249, -,131,,110,224,136,,57,249, -,137,,34,255,124,,57,249, -1,172,,,214,52,,67,254,4 -137,247,89,,115,2,28,181,255,139 \ No newline at end of file diff --git a/bmps/nimbus-romono/N.alpha b/bmps/nimbus-romono/N.alpha deleted file mode 100644 index 5690c84..0000000 --- a/bmps/nimbus-romono/N.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -127,253,197,2,,,37,171,248,121 -,165,255,108,,,,26,186, -,154,201,242,30,,,3,164, -,154,45,247,182,,,,161, -,154,7,122,255,89,,,161, -,154,7,4,204,235,21,,161, -,154,7,,47,250,161,,161, -,154,7,,,135,255,71,161, -,154,7,,,8,217,223,161, -,160,12,,,,61,253,161, -,189,41,,,,,149,161, -116,203,160,36,,,,13,132, \ No newline at end of file diff --git a/bmps/nimbus-romono/O.alpha b/bmps/nimbus-romono/O.alpha deleted file mode 100644 index 0410217..0000000 --- a/bmps/nimbus-romono/O.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,67,181,178,174,181,64,, -,103,234,54,,,50,236,101, -39,249,104,,,,,107,249,41 -149,253,18,,,,,17,253,149 -216,220,,,,,,,219,215 -247,197,,,,,,,198,245 -246,197,,,,,,,199,246 -215,219,,,,,,,222,217 -149,253,16,,,,,21,254,151 -42,250,104,,,,,112,249,41 -,103,233,46,,,50,238,102, -,,63,179,173,172,177,63,, \ No newline at end of file diff --git a/bmps/nimbus-romono/P.alpha b/bmps/nimbus-romono/P.alpha deleted file mode 100644 index 8d0bf81..0000000 --- a/bmps/nimbus-romono/P.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -112,235,255,202,192,213,179,72, -,154,255,49,,9,153,254,98 -,143,255,47,,,9,251,220 -,143,255,47,,,,231,244 -,143,255,47,,,26,254,188 -,143,255,47,3,47,196,236,45 -,143,255,196,190,175,123,25, -,143,255,47,,,,, -,143,255,47,,,,, -,144,255,47,,,,, -,156,255,58,,,,, -112,235,255,188,77,,,, \ No newline at end of file diff --git a/bmps/nimbus-romono/Q.alpha b/bmps/nimbus-romono/Q.alpha deleted file mode 100644 index b88cbf6..0000000 --- a/bmps/nimbus-romono/Q.alpha +++ /dev/null @@ -1,16 +0,0 @@ -0 -,,72,182,167,179,174,45,, -,105,230,47,,,78,242,63, -39,249,95,,,,,149,227,10 -146,252,12,,,,,57,255,95 -214,226,,,,,,8,253,162 -246,195,,,,,,,238,194 -248,188,,,,,,,237,196 -222,208,,,,,,8,252,170 -161,248,6,,,,,53,255,107 -55,253,80,,,,,133,239,15 -,132,216,22,,,51,237,83, -,,98,205,153,168,188,69,, -,,,36,241,253,70,,, -,,,,62,240,237,61,, -,,,,,21,130,198,148,104 \ No newline at end of file diff --git a/bmps/nimbus-romono/R.alpha b/bmps/nimbus-romono/R.alpha deleted file mode 100644 index 7fc7683..0000000 --- a/bmps/nimbus-romono/R.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -116,244,255,187,190,214,143,18,, -,182,237,,,32,231,198,1, -,172,233,,,,139,255,40, -,172,233,,,,131,255,52, -,172,233,,,2,199,233,10, -,172,237,69,98,198,214,57,, -,172,243,119,249,184,,,, -,172,233,,127,255,87,,, -,172,233,,4,204,239,29,, -,173,233,,,48,250,185,1, -,184,242,1,,,128,255,111, -116,245,255,144,30,,6,209,252,131 \ No newline at end of file diff --git a/bmps/nimbus-romono/S.alpha b/bmps/nimbus-romono/S.alpha deleted file mode 100644 index ba88970..0000000 --- a/bmps/nimbus-romono/S.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,53,190,189,184,156,157,68 -28,239,87,,,70,238,96 -100,255,28,,,,85,123 -102,255,147,1,,,3,97 -20,236,255,175,29,,, -,47,218,255,244,119,5, -,,7,125,247,255,191,15 -,,,,38,217,255,157 -100,,,,,26,244,238 -198,25,,,,,216,216 -174,202,24,,,54,252,101 -134,127,158,157,171,197,89, \ No newline at end of file diff --git a/bmps/nimbus-romono/T.alpha b/bmps/nimbus-romono/T.alpha deleted file mode 100644 index bbba02a..0000000 --- a/bmps/nimbus-romono/T.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -232,247,208,189,247,247,189,208,247,232 -220,27,,,226,226,,,27,219 -141,,,,226,226,,,,140 -7,,,,226,226,,,,7 -,,,,226,226,,,, -,,,,226,226,,,, -,,,,226,226,,,, -,,,,226,226,,,, -,,,,226,226,,,, -,,,,226,226,,,, -,,,1,239,237,,,, -,,50,149,255,255,148,53,, \ No newline at end of file diff --git a/bmps/nimbus-romono/U.alpha b/bmps/nimbus-romono/U.alpha deleted file mode 100644 index 5fe8e4c..0000000 --- a/bmps/nimbus-romono/U.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -111,244,251,120,8,,34,171,248,120 -,186,206,,,,,24,184, -,178,198,,,,,2,165, -,178,198,,,,,,162, -,178,198,,,,,,162, -,178,198,,,,,,162, -,178,198,,,,,,162, -,174,199,,,,,2,158, -,150,212,,,,,15,142, -,113,247,10,,,,64,92, -,24,240,141,2,,28,177,13, -,,53,192,222,194,172,36,, \ No newline at end of file diff --git a/bmps/nimbus-romono/V.alpha b/bmps/nimbus-romono/V.alpha deleted file mode 100644 index e734026..0000000 --- a/bmps/nimbus-romono/V.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -137,255,240,93,,,1,123,254,140 -,202,243,7,,,,11,215,2 -,87,255,72,,,,67,124, -,8,239,159,,,,150,40, -,,153,244,12,,2,187,, -,,59,255,92,,63,128,, -,,,217,185,,147,45,, -,,,126,253,30,192,,, -,,,33,254,178,135,,, -,,,,193,255,51,,, -,,,,99,223,1,,, -,,,,14,130,,,, \ No newline at end of file diff --git a/bmps/nimbus-romono/W.alpha b/bmps/nimbus-romono/W.alpha deleted file mode 100644 index c52d51b..0000000 --- a/bmps/nimbus-romono/W.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -175,253,73,76,252,179,19,13,190,178 -44,253,9,,189,120,,,113,38 -,225,61,,116,175,,,127, -,167,120,,74,234,1,,128, -,112,179,,117,244,39,10,121, -,57,238,2,127,190,99,64,71, -,7,248,44,126,132,158,120,19, -,,201,146,87,73,218,140,, -,,145,244,32,17,253,151,, -,,90,230,,,212,110,, -,,34,174,,,153,55,, -,,,95,,,89,7,, \ No newline at end of file diff --git a/bmps/nimbus-romono/X.alpha b/bmps/nimbus-romono/X.alpha deleted file mode 100644 index 2b79a70..0000000 --- a/bmps/nimbus-romono/X.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -92,232,255,184,46,,54,201,228,97 -,73,255,158,,,,182,52, -,,167,246,27,,83,115,, -,,25,244,153,18,180,3,, -,,,130,252,183,48,,, -,,,13,233,201,,,, -,,,11,216,255,70,,, -,,,143,75,219,213,4,, -,,54,156,,89,255,100,, -,8,191,19,,1,207,230,12, -,146,114,,,,92,255,139, -133,254,168,34,,24,151,255,253,138 \ No newline at end of file diff --git a/bmps/nimbus-romono/Y.alpha b/bmps/nimbus-romono/Y.alpha deleted file mode 100644 index 0d0456d..0000000 --- a/bmps/nimbus-romono/Y.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -139,255,255,125,10,,20,151,253,134 -,172,255,70,,,,100,147, -,27,241,193,,,4,189,11, -,,115,255,76,,96,101,, -,,6,220,215,9,183,4,, -,,,88,255,187,86,,, -,,,1,209,220,1,,, -,,,,178,204,,,, -,,,,178,204,,,, -,,,,179,204,,,, -,,,,190,213,,,, -,,15,118,246,253,124,28,, \ No newline at end of file diff --git a/bmps/nimbus-romono/Z.alpha b/bmps/nimbus-romono/Z.alpha deleted file mode 100644 index 4990257..0000000 --- a/bmps/nimbus-romono/Z.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -87,255,218,180,170,170,170,227,255,124 -115,117,,,,,39,246,209,6 -131,5,,,,2,195,251,52, -15,,,,,117,255,131,, -,,,,40,247,213,7,, -,,,4,201,251,52,,, -,,,124,255,130,,,, -,,42,247,213,8,,,, -,5,206,251,51,,,,,21 -,128,255,131,,,,,,139 -49,250,211,7,,,,,59,194 -210,255,205,170,170,170,174,203,253,168 \ No newline at end of file diff --git a/bmps/nimbus-romono/[.alpha b/bmps/nimbus-romono/[.alpha deleted file mode 100644 index b5a6aa7..0000000 --- a/bmps/nimbus-romono/[.alpha +++ /dev/null @@ -1,16 +0,0 @@ -0 -255,212,121,119 -255,115,, -255,113,, -255,113,, -255,113,, -255,113,, -255,113,, -255,113,, -255,113,, -255,113,, -255,113,, -255,113,, -255,113,, -255,119,, -255,221,124,119 \ No newline at end of file diff --git a/bmps/nimbus-romono/].alpha b/bmps/nimbus-romono/].alpha deleted file mode 100644 index dfe4369..0000000 --- a/bmps/nimbus-romono/].alpha +++ /dev/null @@ -1,16 +0,0 @@ -0 -119,124,221,255 -,,120,255 -,,113,255 -,,113,255 -,,113,255 -,,113,255 -,,113,255 -,,113,255 -,,113,255 -,,113,255 -,,113,255 -,,113,255 -,,113,255 -,,116,255 -119,122,213,255 \ No newline at end of file diff --git a/bmps/nimbus-romono/^.alpha b/bmps/nimbus-romono/^.alpha deleted file mode 100644 index fc9b831..0000000 --- a/bmps/nimbus-romono/^.alpha +++ /dev/null @@ -1,7 +0,0 @@ -0 -,,59,255,63,, -,,190,182,190,, -,59,220,7,217,63, -,191,97,,96,190, -60,224,6,,3,218,63 -191,98,,,,98,191 \ No newline at end of file diff --git a/bmps/nimbus-romono/_.alpha b/bmps/nimbus-romono/_.alpha deleted file mode 100644 index 4a05619..0000000 --- a/bmps/nimbus-romono/_.alpha +++ /dev/null @@ -1,4 +0,0 @@ -9 -,,,,,,,, -,,,,,,,, -255,255,255,255,255,255,255,255,255 \ No newline at end of file diff --git a/bmps/nimbus-romono/`.alpha b/bmps/nimbus-romono/`.alpha deleted file mode 100644 index b94dabf..0000000 --- a/bmps/nimbus-romono/`.alpha +++ /dev/null @@ -1,4 +0,0 @@ -0 -219,115,, -67,221,122, -,9,128,129 \ No newline at end of file diff --git a/bmps/nimbus-romono/a.alpha b/bmps/nimbus-romono/a.alpha deleted file mode 100644 index a45fd17..0000000 --- a/bmps/nimbus-romono/a.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -11,144,116,122,183,27, -138,205,,,188,145, -69,94,,,179,179, -,9,91,102,201,184, -50,197,40,,173,184, -213,146,,,175,184, -238,200,14,56,217,206,20 -101,238,211,86,103,242,142 \ No newline at end of file diff --git a/bmps/nimbus-romono/b.alpha b/bmps/nimbus-romono/b.alpha deleted file mode 100644 index 4c26271..0000000 --- a/bmps/nimbus-romono/b.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -97,175,139,,,,, -22,241,148,,,,, -,220,148,,,,, -,220,148,,18,9,, -,220,158,172,251,249,146,4 -,220,216,39,5,124,255,110 -,220,151,,,1,218,210 -,220,148,,,,166,246 -,220,148,,,,140,228 -,220,148,,,,169,151 -,219,157,,,31,219,25 -,79,194,172,144,145,30, \ No newline at end of file diff --git a/bmps/nimbus-romono/c.alpha b/bmps/nimbus-romono/c.alpha deleted file mode 100644 index 2768241..0000000 --- a/bmps/nimbus-romono/c.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -,33,140,125,171,169,23 -38,216,22,,16,245,162 -169,138,,,,67,47 -237,110,,,,, -242,142,,,,, -197,235,17,,,,86 -74,255,216,96,70,152,66 -,81,216,246,197,65, \ No newline at end of file diff --git a/bmps/nimbus-romono/d.alpha b/bmps/nimbus-romono/d.alpha deleted file mode 100644 index a4cef92..0000000 --- a/bmps/nimbus-romono/d.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,,,71,158,193, -,,,,10,186,215, -,,,,,153,215, -,,3,26,3,153,215, -,77,175,105,142,207,215, -42,230,12,,,196,215, -168,156,,,,154,215, -223,131,,,,153,215, -243,150,,,,153,215, -206,217,1,,,153,216, -97,255,133,8,21,212,244,52 -1,111,218,238,159,149,161,71 \ No newline at end of file diff --git a/bmps/nimbus-romono/e.alpha b/bmps/nimbus-romono/e.alpha deleted file mode 100644 index 0f38b2a..0000000 --- a/bmps/nimbus-romono/e.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -,60,136,158,206,85, -59,163,,,111,254,54 -183,158,102,102,130,255,138 -240,102,34,34,34,34,22 -243,115,,,,, -204,212,5,,,,105 -96,255,182,66,64,160,57 -1,108,216,243,191,58, \ No newline at end of file diff --git a/bmps/nimbus-romono/f.alpha b/bmps/nimbus-romono/f.alpha deleted file mode 100644 index e8bba8a..0000000 --- a/bmps/nimbus-romono/f.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,90,118,220,157 -,36,203,,54,164 -,120,189,,, -,149,189,,, -151,217,230,153,119, -,160,194,,, -,160,194,,, -,160,194,,, -,160,194,,, -,160,194,,, -,168,199,,, -87,232,246,100,20, \ No newline at end of file diff --git a/bmps/nimbus-romono/g.alpha b/bmps/nimbus-romono/g.alpha deleted file mode 100644 index 5f4f3e0..0000000 --- a/bmps/nimbus-romono/g.alpha +++ /dev/null @@ -1,13 +0,0 @@ -4 -,31,153,127,181,163,113,102 -4,210,94,,23,246,184,68 -45,255,72,,,176,205, -41,255,115,,,149,178, -,156,227,38,16,201,51, -,18,153,116,100,23,, -8,200,39,,,,, -18,230,255,253,238,226,176,35 -7,130,56,72,92,114,146,170 -177,90,,,,,,123 -229,191,52,11,15,54,136,43 -49,181,236,247,212,133,21, \ No newline at end of file diff --git a/bmps/nimbus-romono/h.alpha b/bmps/nimbus-romono/h.alpha deleted file mode 100644 index bd662f9..0000000 --- a/bmps/nimbus-romono/h.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -96,180,115,,,,, -34,251,122,,,,, -,237,122,,,,, -,237,122,,9,3,, -,237,127,158,234,243,79, -,237,203,39,1,177,211, -,237,122,,,111,247, -,237,122,,,105,254, -,237,122,,,105,254, -,237,122,,,105,254, -,243,127,,,111,255,3 -110,255,207,49,43,199,255,120 \ No newline at end of file diff --git a/bmps/nimbus-romono/i.alpha b/bmps/nimbus-romono/i.alpha deleted file mode 100644 index 9753630..0000000 --- a/bmps/nimbus-romono/i.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,186,138, -,137,99, -,,, -,,3, -69,164,182, -26,205,191, -,171,191, -,170,191, -,170,191, -,170,191, -,177,196, -88,235,242,92 \ No newline at end of file diff --git a/bmps/nimbus-romono/j.alpha b/bmps/nimbus-romono/j.alpha deleted file mode 100644 index 2c0b3bb..0000000 --- a/bmps/nimbus-romono/j.alpha +++ /dev/null @@ -1,17 +0,0 @@ -2 -,,,180,196 -,,,137,148 -,,,, -,,,,1 -,1,68,151,226 -,3,40,199,250 -,,,156,250 -,,,155,250 -,,,155,250 -,,,155,250 -,,,155,250 -,,,155,250 -,,,155,243 -,,,161,207 -129,71,,184,115 -164,242,143,127,3 \ No newline at end of file diff --git a/bmps/nimbus-romono/k.alpha b/bmps/nimbus-romono/k.alpha deleted file mode 100644 index ba33eb7..0000000 --- a/bmps/nimbus-romono/k.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -91,162,200,,,,,, -11,199,223,,,,,, -,165,223,,,,,, -,164,223,,,,,, -,164,223,,9,136,225,116,44 -,164,223,,27,172,41,, -,164,223,46,149,13,,, -,164,233,235,125,,,, -,164,223,108,254,84,,, -,164,223,,162,243,44,, -,167,224,,12,214,219,27, -92,227,249,100,16,127,255,224,105 \ No newline at end of file diff --git a/bmps/nimbus-romono/l.alpha b/bmps/nimbus-romono/l.alpha deleted file mode 100644 index ef5f819..0000000 --- a/bmps/nimbus-romono/l.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -95,169,171, -12,205,188, -,172,188, -,171,188, -,171,188, -,171,188, -,171,188, -,171,188, -,171,188, -,171,188, -,175,191, -88,235,238,88 \ No newline at end of file diff --git a/bmps/nimbus-romono/m.alpha b/bmps/nimbus-romono/m.alpha deleted file mode 100644 index 9365eb4..0000000 --- a/bmps/nimbus-romono/m.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -91,176,137,79,211,244,111,25,166,236,208,33, -12,231,207,62,1,124,247,140,15,9,216,149, -,205,162,,,60,255,58,,,165,194, -,204,162,,,54,255,58,,,158,208, -,204,162,,,54,255,58,,,158,208, -,204,162,,,54,255,58,,,158,208, -,208,163,,,57,255,63,,,162,211, -89,247,220,71,27,158,255,166,33,63,222,248,92 \ No newline at end of file diff --git a/bmps/nimbus-romono/n.alpha b/bmps/nimbus-romono/n.alpha deleted file mode 100644 index 44e3d69..0000000 --- a/bmps/nimbus-romono/n.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -98,183,115,109,236,222,58, -20,251,199,57,8,194,197, -,232,133,,,126,239, -,232,133,,,121,245, -,232,133,,,121,245, -,232,133,,,121,245, -,236,134,,,127,247, -99,254,205,57,43,209,255,109 \ No newline at end of file diff --git a/bmps/nimbus-romono/o.alpha b/bmps/nimbus-romono/o.alpha deleted file mode 100644 index 972b153..0000000 --- a/bmps/nimbus-romono/o.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -,56,158,126,156,183,45, -56,239,29,,,126,249,59 -187,184,,,,10,238,192 -244,173,,,,,191,246 -242,202,,,,,169,237 -181,250,23,,,,196,167 -48,245,139,,,42,235,35 -,48,182,164,128,150,37, \ No newline at end of file diff --git a/bmps/nimbus-romono/p.alpha b/bmps/nimbus-romono/p.alpha deleted file mode 100644 index e49212e..0000000 --- a/bmps/nimbus-romono/p.alpha +++ /dev/null @@ -1,13 +0,0 @@ -4 -63,158,151,109,230,231,129,1 -49,235,222,84,32,145,255,103 -,204,168,,,1,219,205 -,203,165,,,,150,243 -,203,165,,,,129,226 -,203,165,,,,154,177 -,203,174,,,6,228,58 -,203,224,126,77,177,114, -,203,165,34,75,27,, -,203,165,,,,, -,206,170,,,,, -106,247,233,100,14,,, \ No newline at end of file diff --git a/bmps/nimbus-romono/q.alpha b/bmps/nimbus-romono/q.alpha deleted file mode 100644 index a86ca2a..0000000 --- a/bmps/nimbus-romono/q.alpha +++ /dev/null @@ -1,13 +0,0 @@ -4 -,41,163,141,136,136,179, -29,229,39,,,175,233, -154,173,,,,138,233, -227,135,,,,136,233, -249,147,,,,136,233, -223,191,,,,137,233, -151,253,68,,6,182,233, -26,216,252,206,178,164,233, -,11,74,53,1,136,233, -,,,,,136,233, -,,,,,143,235, -,,,6,102,230,254,116 \ No newline at end of file diff --git a/bmps/nimbus-romono/r.alpha b/bmps/nimbus-romono/r.alpha deleted file mode 100644 index bb7f4b1..0000000 --- a/bmps/nimbus-romono/r.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -57,146,185,55,226,199 -45,221,230,90,87,138 -,182,218,,, -,181,208,,, -,181,208,,, -,181,208,,, -,185,213,,, -98,239,251,110,25, \ No newline at end of file diff --git a/bmps/nimbus-romono/s.alpha b/bmps/nimbus-romono/s.alpha deleted file mode 100644 index a94a015..0000000 --- a/bmps/nimbus-romono/s.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -62,136,96,156,82 -220,26,,43,106 -237,146,5,,39 -102,254,213,63, -,66,216,252,102 -72,,5,164,240 -181,,,62,208 -197,124,97,147,46 \ No newline at end of file diff --git a/bmps/nimbus-romono/t.alpha b/bmps/nimbus-romono/t.alpha deleted file mode 100644 index 97e9629..0000000 --- a/bmps/nimbus-romono/t.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,15,121,, -10,185,165,, -135,250,213,136,75 -,237,165,, -,237,165,, -,237,165,, -,237,165,, -,237,167,, -,217,206,3,51 -,97,242,201,70 \ No newline at end of file diff --git a/bmps/nimbus-romono/u.alpha b/bmps/nimbus-romono/u.alpha deleted file mode 100644 index b772cbd..0000000 --- a/bmps/nimbus-romono/u.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -99,255,124,,65,203,241, -,243,124,,,125,241, -,241,124,,,124,241, -,241,124,,,124,241, -,241,124,,,124,241, -,240,126,,,128,241, -,205,201,21,58,188,251,35 -,61,220,234,127,97,180,94 \ No newline at end of file diff --git a/bmps/nimbus-romono/v.alpha b/bmps/nimbus-romono/v.alpha deleted file mode 100644 index 60d2b8e..0000000 --- a/bmps/nimbus-romono/v.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -125,255,205,33,,34,207,142 -1,202,213,,,,174,7 -,77,255,59,,42,127, -,2,221,161,,139,30, -,,116,246,24,155,, -,,17,245,192,74,, -,,,154,225,3,, -,,,48,106,,, \ No newline at end of file diff --git a/bmps/nimbus-romono/w.alpha b/bmps/nimbus-romono/w.alpha deleted file mode 100644 index dc85f76..0000000 --- a/bmps/nimbus-romono/w.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -160,255,169,15,63,237,248,89,,14,175,178 -14,241,145,,,120,252,20,,,151,38 -,148,235,7,,59,255,107,,8,166, -,45,255,87,,156,186,206,,94,81, -,,196,187,29,154,56,255,49,173,4, -,,92,253,176,39,,209,196,126,, -,,7,234,168,,,108,251,26,, -,,,117,42,,,15,150,,, \ No newline at end of file diff --git a/bmps/nimbus-romono/x.alpha b/bmps/nimbus-romono/x.alpha deleted file mode 100644 index b4d2753..0000000 --- a/bmps/nimbus-romono/x.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -82,236,254,66,43,238,132,15 -,75,255,88,69,127,, -,,165,226,175,5,, -,,22,238,150,,, -,,48,209,252,54,, -,6,178,15,206,210,5, -,132,73,,54,252,124, -121,237,39,,38,230,252,119 \ No newline at end of file diff --git a/bmps/nimbus-romono/y.alpha b/bmps/nimbus-romono/y.alpha deleted file mode 100644 index 2f27fd1..0000000 --- a/bmps/nimbus-romono/y.alpha +++ /dev/null @@ -1,13 +0,0 @@ -4 -130,255,200,46,,26,187,157 -,207,201,,,,179,14 -,93,255,55,,24,162, -,5,227,165,,108,72, -,,120,250,29,172,4, -,,17,243,161,140,, -,,,140,255,48,, -,,,41,211,,, -,,,83,115,,, -,,,170,18,,, -110,185,165,134,,,, -114,243,166,9,,,, \ No newline at end of file diff --git a/bmps/nimbus-romono/z.alpha b/bmps/nimbus-romono/z.alpha deleted file mode 100644 index 4f442f8..0000000 --- a/bmps/nimbus-romono/z.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -126,183,136,136,183,255,140 -107,2,,8,215,220,11 -6,,,137,253,62, -,,55,252,143,, -,7,212,221,12,, -,133,253,60,,,41 -51,251,143,,,,133 -210,254,146,136,141,176,202 \ No newline at end of file diff --git a/bmps/nimbus-romono/{.alpha b/bmps/nimbus-romono/{.alpha deleted file mode 100644 index b16f9f0..0000000 --- a/bmps/nimbus-romono/{.alpha +++ /dev/null @@ -1,17 +0,0 @@ -0 -,,101,191,85 -,31,253,87, -,70,255,49, -,77,255,46, -,77,255,46, -,77,255,44, -,98,252,19, -49,193,114,, -45,191,115,, -,97,253,19, -,77,255,44, -,77,255,46, -,77,255,46, -,70,255,49, -,28,251,88, -,,97,189,85 \ No newline at end of file diff --git a/bmps/nimbus-romono/|.alpha b/bmps/nimbus-romono/|.alpha deleted file mode 100644 index 8da9a62..0000000 --- a/bmps/nimbus-romono/|.alpha +++ /dev/null @@ -1,15 +0,0 @@ -0 -255 -255 -255 -255 -255 -255 -255 -255 -255 -255 -255 -255 -255 -255 \ No newline at end of file diff --git a/bmps/nimbus-romono/}.alpha b/bmps/nimbus-romono/}.alpha deleted file mode 100644 index 4b33717..0000000 --- a/bmps/nimbus-romono/}.alpha +++ /dev/null @@ -1,17 +0,0 @@ -0 -86,192,99,, -,91,252,28, -,50,255,69, -,46,255,77, -,46,255,77, -,44,255,77, -,21,253,96, -,,115,191,49 -,,117,192,45 -,21,253,96, -,44,255,77, -,46,255,77, -,46,255,77, -,50,255,70, -,91,252,29, -86,191,98,, \ No newline at end of file diff --git a/bmps/nimbus-romono/~.alpha b/bmps/nimbus-romono/~.alpha deleted file mode 100644 index 0d5fccc..0000000 --- a/bmps/nimbus-romono/~.alpha +++ /dev/null @@ -1,4 +0,0 @@ -5 -18,189,244,193,66,,,46,64 -180,221,127,185,255,185,128,223,178 -64,45,,,67,195,244,187,16 \ No newline at end of file diff --git a/bmps/nimbus-romono/█.alpha b/bmps/nimbus-romono/█.alpha deleted file mode 100644 index 2a7f8e6..0000000 --- a/bmps/nimbus-romono/█.alpha +++ /dev/null @@ -1,16 +0,0 @@ -1 -255,255,255,255,255,255,255,255 -255,255,255,255,255,255,255,255 -255,255,255,255,255,255,255,255 -255,255,255,255,255,255,255,255 -255,255,255,255,255,255,255,255 -255,255,255,255,255,255,255,255 -255,255,255,255,255,255,255,255 -255,255,255,255,255,255,255,255 -255,255,255,255,255,255,255,255 -255,255,255,255,255,255,255,255 -255,255,255,255,255,255,255,255 -255,255,255,255,255,255,255,255 -255,255,255,255,255,255,255,255 -255,255,255,255,255,255,255,255 -255,255,255,255,255,255,255,255 \ No newline at end of file diff --git a/bmps/nimbus-romono/𐘅.alpha b/bmps/nimbus-romono/𐘅.alpha deleted file mode 100644 index daf548f..0000000 --- a/bmps/nimbus-romono/𐘅.alpha +++ /dev/null @@ -1,3 +0,0 @@ -9 -196,192 -197,194 \ No newline at end of file diff --git a/bmps/nimbus-romono/𐘋.alpha b/bmps/nimbus-romono/𐘋.alpha deleted file mode 100644 index c7952ed..0000000 --- a/bmps/nimbus-romono/𐘋.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,,76,213 -,,,158,131 -,,3,235,50 -,,67,223,1 -,,149,140, -,2,229,59, -,59,232,2, -,141,150,, -,221,69,, -50,239,6,, -132,159,,, -214,78,,, \ No newline at end of file diff --git a/bmps/nimbus-romono/𐚆.alpha b/bmps/nimbus-romono/𐚆.alpha deleted file mode 100644 index eca63a2..0000000 --- a/bmps/nimbus-romono/𐚆.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -214,75,,, -132,157,,, -50,236,4,, -,221,67,, -,141,149,, -,60,231,2, -,2,230,58, -,,151,140, -,,69,223,1 -,,5,237,50 -,,,160,132 -,,,79,217 \ No newline at end of file diff --git a/bmps/shippori-mincho/ぁ.alpha b/bmps/shippori-mincho/ぁ.alpha deleted file mode 100644 index 5ace4fd..0000000 --- a/bmps/shippori-mincho/ぁ.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -,,171,110,1,, -31,26,127,231,184,, -25,173,213,132,11,, -,12,199,213,179,181,39 -13,186,197,177,,73,183 -156,70,178,148,,,212 -180,69,226,83,,35,206 -188,197,86,49,22,184,99 -,,52,163,172,76, \ No newline at end of file diff --git a/bmps/shippori-mincho/あ.alpha b/bmps/shippori-mincho/あ.alpha deleted file mode 100644 index df46008..0000000 --- a/bmps/shippori-mincho/あ.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -,,,127,137,,,,, -,,,31,204,157,128,,, -3,103,78,134,222,170,59,,, -,22,94,139,85,,,,, -,,,133,144,148,127,154,62, -,11,142,181,43,124,,13,187,74 -4,161,31,143,127,75,,,43,204 -114,72,,143,184,,,,3,245 -183,,22,209,102,,,,32,220 -205,82,205,105,135,,,,140,114 -97,154,44,,,,13,134,143,1 -,,,8,81,101,125,50,, \ No newline at end of file diff --git a/bmps/shippori-mincho/い.alpha b/bmps/shippori-mincho/い.alpha deleted file mode 100644 index 5224568..0000000 --- a/bmps/shippori-mincho/い.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -150,68,,,,,,,, -105,156,,,,,27,98,50, -127,88,,,,,,9,193,92 -150,38,,,,,,,81,231 -141,46,,37,,,,,6,74 -81,147,,111,,,,,, -3,195,168,157,,,,,, -,15,157,195,,,,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/う.alpha b/bmps/shippori-mincho/う.alpha deleted file mode 100644 index 6f4f6c8..0000000 --- a/bmps/shippori-mincho/う.alpha +++ /dev/null @@ -1,13 +0,0 @@ -0 -9,111,110,77,4, -,22,179,174,65, -,28,,,, -30,20,74,113,93,6 -181,240,112,16,124,160 -,6,,,18,235 -,,,,14,236 -,,,,65,190 -,,,,161,85 -,,,57,189,3 -,,43,151,15, -5,70,66,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/え.alpha b/bmps/shippori-mincho/え.alpha deleted file mode 100644 index 956029f..0000000 --- a/bmps/shippori-mincho/え.alpha +++ /dev/null @@ -1,12 +0,0 @@ -1 -,,46,88,8,2,,, -,,,145,253,148,,, -,,48,85,16,,,, -,,,,31,59,1,, -9,164,135,135,101,242,86,, -,35,85,6,168,112,2,, -,,5,147,48,,,, -,5,156,132,76,,,, -4,169,115,17,152,34,,, -167,129,,,78,105,,8,22 -169,7,,,11,178,223,235,186 \ No newline at end of file diff --git a/bmps/shippori-mincho/お.alpha b/bmps/shippori-mincho/お.alpha deleted file mode 100644 index 8846ea4..0000000 --- a/bmps/shippori-mincho/お.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -,8,151,81,,,,,, -,,50,165,28,,,3,50,15 -56,70,131,208,97,,,64,119,212 -8,81,69,105,,27,79,83,5,14 -,,30,168,109,70,14,106,103, -32,88,170,123,27,25,,132,81, -194,159,97,122,103,24,132,169,2, -,,137,80,41,154,93,1,, \ No newline at end of file diff --git a/bmps/shippori-mincho/か.alpha b/bmps/shippori-mincho/か.alpha deleted file mode 100644 index 4a8f8ce..0000000 --- a/bmps/shippori-mincho/か.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -,,102,149,,,,,, -,,24,155,,,,,, -,,49,172,114,67,,41,100,8 -162,181,212,89,,156,7,,51,173 -8,15,160,3,,140,22,17,92,226 -,26,155,,,166,3,,16,48 -,162,53,,6,176,,,, -60,181,8,89,118,115,,,, -70,34,,111,190,9,,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/が.alpha b/bmps/shippori-mincho/が.alpha deleted file mode 100644 index 466b4e1..0000000 --- a/bmps/shippori-mincho/が.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -,,62,65,,,,,3,88,172 -,,26,193,,,,1,96,171,10 -,,20,149,36,14,,28,32,21, -111,106,173,176,82,159,12,,84,148, -48,81,149,22,,112,52,1,26,215,27 -,8,170,,,138,34,8,57,112,1 -,132,80,,,185,1,,,, -47,195,5,77,79,151,,,,, -71,43,,98,207,22,,,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/き.alpha b/bmps/shippori-mincho/き.alpha deleted file mode 100644 index a2653d0..0000000 --- a/bmps/shippori-mincho/き.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -23,185,44,,, -36,19,158,90,, -18,141,140,134,23,12 -26,,,138,190,205 -65,138,155,165,177,6 -,,,,141,31 -,64,97,118,144,149 -87,31,,7,120,104 -134,19,,,, -39,194,224,185,, \ No newline at end of file diff --git a/bmps/shippori-mincho/ぎ.alpha b/bmps/shippori-mincho/ぎ.alpha deleted file mode 100644 index 65c93e3..0000000 --- a/bmps/shippori-mincho/ぎ.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -13,171,100,,,,6,101,49 -35,16,148,113,30,25,130,57,147 -10,128,147,173,44,17,48,117, -29,,,54,162,249,134,, -58,134,152,160,205,84,,, -,,,,24,169,,, -,49,92,114,109,207,71,, -84,50,,,46,172,41,, -138,34,,,,,,, -27,181,216,224,72,,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/く.alpha b/bmps/shippori-mincho/く.alpha deleted file mode 100644 index 6be6288..0000000 --- a/bmps/shippori-mincho/く.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,23,174 -,57,193 -,185,43 -81,90, -117,, -125,1, -51,114, -,163,50 -,69,177 -,2,183 \ No newline at end of file diff --git a/bmps/shippori-mincho/ぐ.alpha b/bmps/shippori-mincho/ぐ.alpha deleted file mode 100644 index 59e0a99..0000000 --- a/bmps/shippori-mincho/ぐ.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,14,180,16,,, -,34,223,9,1,23, -,173,71,34,42,75,174 -70,112,,1,159,91,33 -125,,,,8,14, -131,3,,,,, -41,135,,,,, -,144,82,,,, -,39,220,1,,, -,,176,21,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/け.alpha b/bmps/shippori-mincho/け.alpha deleted file mode 100644 index 608acc3..0000000 --- a/bmps/shippori-mincho/け.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -70,,,,,149,99, -131,44,,,,80,153,44 -126,64,,13,4,100,196,165 -160,10,2,18,121,157,121, -146,1,69,,,52,118, -136,83,28,,,60,122, -155,149,,,,87,97, -191,120,,,,147,22, -117,124,,,25,126,, -9,79,,23,77,3,, \ No newline at end of file diff --git a/bmps/shippori-mincho/げ.alpha b/bmps/shippori-mincho/げ.alpha deleted file mode 100644 index 6ad1045..0000000 --- a/bmps/shippori-mincho/げ.alpha +++ /dev/null @@ -1,12 +0,0 @@ -1 -,,,,,40,20,46,89,146 -108,4,,,,59,206,99,141,58 -119,75,,,,8,202,100,65, -126,70,,19,49,84,230,162,25, -163,10,9,,60,91,179,,, -150,,80,,,,180,,, -142,82,38,,,,190,,, -164,162,,,,24,170,,, -185,134,,,,92,84,,, -106,145,,,5,147,4,,, -5,84,,13,77,15,,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/こ.alpha b/bmps/shippori-mincho/こ.alpha deleted file mode 100644 index 49c28cd..0000000 --- a/bmps/shippori-mincho/こ.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -,103,134,134,114, -,,78,173,93, -,,41,,, -,,,,, -,,,,, -30,,,,, -151,14,,,23,32 -69,195,217,245,231,165 \ No newline at end of file diff --git a/bmps/shippori-mincho/ご.alpha b/bmps/shippori-mincho/ご.alpha deleted file mode 100644 index 5262a4a..0000000 --- a/bmps/shippori-mincho/ご.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -,101,134,133,119,2,63,19 -,,74,174,105,76,50,163 -,,41,,,50,162, -,,,,,,, -,,,,,,, -30,,,,,,, -152,15,,,23,33,, -69,194,217,246,232,172,1, \ No newline at end of file diff --git a/bmps/shippori-mincho/さ.alpha b/bmps/shippori-mincho/さ.alpha deleted file mode 100644 index c749650..0000000 --- a/bmps/shippori-mincho/さ.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -,14,209,86,90,57, -14,,93,110,197,75, -77,126,158,146,148,16, -,,,,16,157,11 -,,,,,52,147 -,24,92,89,108,100,225 -,147,1,,,85,114 -,178,12,,,, -,69,204,218,196,2, \ No newline at end of file diff --git a/bmps/shippori-mincho/ざ.alpha b/bmps/shippori-mincho/ざ.alpha deleted file mode 100644 index be5557d..0000000 --- a/bmps/shippori-mincho/ざ.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,,21,2,,,14,49,95,159 -,,213,107,111,136,25,105,150,35 -37,,29,147,153,157,3,,13, -51,127,152,148,110,114,1,,, -,,,,,63,138,,, -,,,,,,137,84,, -,17,98,86,98,125,151,166,, -,156,6,,,13,125,55,, -,177,36,,,,,,, -,43,188,217,228,90,,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/し.alpha b/bmps/shippori-mincho/し.alpha deleted file mode 100644 index 898e941..0000000 --- a/bmps/shippori-mincho/し.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -171,41,,,,, -117,89,,,,, -126,68,,,,, -140,48,,,,, -156,29,,,,, -168,14,,,,, -148,30,,,,,45 -108,91,,,25,128,38 -11,171,193,165,129,12, \ No newline at end of file diff --git a/bmps/shippori-mincho/じ.alpha b/bmps/shippori-mincho/じ.alpha deleted file mode 100644 index a06ce68..0000000 --- a/bmps/shippori-mincho/じ.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -166,85,,,,74,106,3 -98,139,,7,117,122,83,16 -106,115,,,1,110,5, -125,92,,,,,, -142,70,,,,,, -155,52,,,,,, -133,71,,,,,,51 -87,140,,,,59,132,27 -4,146,200,173,162,93,1, \ No newline at end of file diff --git a/bmps/shippori-mincho/す.alpha b/bmps/shippori-mincho/す.alpha deleted file mode 100644 index f43ea5a..0000000 --- a/bmps/shippori-mincho/す.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,,,,40,196,,,, -,,,,,171,90,80,10, -41,39,74,116,116,188,125,163,181,157 -88,174,114,27,,149,,,, -,,,75,103,191,,,, -,,,107,,217,16,,, -,,,96,133,251,70,,, -,,,2,91,176,54,,, -,,,,19,164,1,,, -,,,40,92,11,,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/ず.alpha b/bmps/shippori-mincho/ず.alpha deleted file mode 100644 index 6e54105..0000000 --- a/bmps/shippori-mincho/ず.alpha +++ /dev/null @@ -1,12 +0,0 @@ -1 -,,,,48,109,,,2,105,173 -,,,,1,202,66,2,96,197,23 -,,,,32,179,134,212,141,100, -125,158,187,148,92,161,34,43,61,65, -14,69,14,10,70,159,,,,, -,,,108,44,195,,,,, -,,,110,,232,22,,,, -,,,79,192,251,62,,,, -,,,,48,173,33,,,, -,,,,31,149,,,,, -,,,44,90,5,,,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/せ.alpha b/bmps/shippori-mincho/せ.alpha deleted file mode 100644 index cffbb53..0000000 --- a/bmps/shippori-mincho/せ.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -,,,,,14,196,24,, -,11,192,60,,,153,63,, -,,118,83,,4,161,146,175,110 -5,,116,162,101,97,173,51,55,67 -175,207,167,85,14,,149,,, -5,6,59,100,14,185,135,,, -,,42,118,,67,17,,, -,,11,149,,,,4,, -,,,127,178,203,224,136,, \ No newline at end of file diff --git a/bmps/shippori-mincho/ぜ.alpha b/bmps/shippori-mincho/ぜ.alpha deleted file mode 100644 index f82ca95..0000000 --- a/bmps/shippori-mincho/ぜ.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -,,,,,3,157,44,34,84,166 -,7,167,63,,,114,94,39,199,24 -,,105,106,,,109,140,163,113,12 -1,,86,165,103,97,179,95,76,96,17 -169,195,176,112,8,1,150,,,, -13,16,42,121,8,157,175,,,, -,,25,139,,60,39,,,, -,,1,161,,,,1,,, -,,,114,176,198,219,179,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/そ.alpha b/bmps/shippori-mincho/そ.alpha deleted file mode 100644 index c3c43c5..0000000 --- a/bmps/shippori-mincho/そ.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,51,93,139,182,33, -,32,122,32,221,44, -,,5,169,49,, -,2,141,43,,, -1,115,30,16,126,217,190 -109,44,110,172,58,15, -202,147,110,11,,, -,,106,,,, -,,151,82,9,, -,,13,133,208,190,1 \ No newline at end of file diff --git a/bmps/shippori-mincho/ぞ.alpha b/bmps/shippori-mincho/ぞ.alpha deleted file mode 100644 index 320d28a..0000000 --- a/bmps/shippori-mincho/ぞ.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,43,81,139,160,116,,8,57,3 -,18,128,31,173,139,22,63,62,197 -,,,124,117,,,125,130,8 -,,110,84,,,,4,25, -,103,56,2,84,185,230,94,, -107,50,92,181,89,28,3,,, -203,159,102,46,,,,,, -,,115,,,,,,, -,,117,122,24,,,,, -,,2,98,194,215,82,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/た.alpha b/bmps/shippori-mincho/た.alpha deleted file mode 100644 index 8518bff..0000000 --- a/bmps/shippori-mincho/た.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -,1,156,35,,,,, -,,130,145,56,,,, -50,65,200,161,26,,48,143,134 -46,95,153,,,,3,106,124 -,22,119,,,,1,, -,84,61,,,,,, -,164,9,,53,,,, -20,194,,,82,81,,, -65,116,,,5,144,207,222,124 \ No newline at end of file diff --git a/bmps/shippori-mincho/だ.alpha b/bmps/shippori-mincho/だ.alpha deleted file mode 100644 index f91d02d..0000000 --- a/bmps/shippori-mincho/だ.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,26,134,,,,,3,7,109,157 -,,179,77,2,,,7,128,145,45 -,7,203,185,6,24,73,81,20,86, -94,168,164,1,,,74,225,88,, -,55,92,,,,55,6,,, -,117,41,,,,,,,, -,175,2,,,,,,,, -20,180,,,37,,,,,, -108,120,,,112,43,,,2,, -138,35,,,24,179,214,228,157,, \ No newline at end of file diff --git a/bmps/shippori-mincho/づ.alpha b/bmps/shippori-mincho/づ.alpha deleted file mode 100644 index 3bd06d2..0000000 --- a/bmps/shippori-mincho/づ.alpha +++ /dev/null @@ -1,12 +0,0 @@ -1 -,13,221,15,,, -7,,180,101,51,, -123,132,209,202,105,, -,42,124,8,,, -,61,75,,,, -,96,48,5,57,60, -,117,119,144,39,71,141 -,97,204,4,,,200 -,7,26,,,4,216 -,,,,,136,100 -,,28,65,107,55, \ No newline at end of file diff --git a/bmps/shippori-mincho/べ.alpha b/bmps/shippori-mincho/べ.alpha deleted file mode 100644 index deddc13..0000000 --- a/bmps/shippori-mincho/べ.alpha +++ /dev/null @@ -1,12 +0,0 @@ -1 -,6,205,41,,,,, -7,,174,102,70,,,51,6 -122,133,207,195,145,2,75,48,186 -,24,145,12,,,56,183,3 -,43,101,,,,,16, -,79,71,2,46,71,9,, -,101,128,152,52,43,176,6, -,80,223,14,,,150,58, -,4,30,,,,185,44, -,,,,,73,162,, -,,23,61,100,81,2,, \ No newline at end of file diff --git a/bmps/shippori-mincho/っ.alpha b/bmps/shippori-mincho/っ.alpha deleted file mode 100644 index 92b055f..0000000 --- a/bmps/shippori-mincho/っ.alpha +++ /dev/null @@ -1,6 +0,0 @@ -7 -,,37,127,96,83,109,44 -99,170,147,15,,,1,170 -18,38,,,,,4,195 -,,,,,7,151,102 -,,9,57,81,114,45, \ No newline at end of file diff --git a/bmps/shippori-mincho/぀.alpha b/bmps/shippori-mincho/぀.alpha deleted file mode 100644 index b5b6ef5..0000000 --- a/bmps/shippori-mincho/぀.alpha +++ /dev/null @@ -1,8 +0,0 @@ -5 -,,,28,134,135,104,115,110,4 -,8,123,200,53,,,,54,133 -133,241,158,9,,,,,,207 -,14,,,,,,,12,228 -,,,,,,,,146,137 -,,,,,,17,156,150,5 -,,,26,66,94,119,43,, \ No newline at end of file diff --git a/bmps/shippori-mincho/い.alpha b/bmps/shippori-mincho/い.alpha deleted file mode 100644 index fc735c0..0000000 --- a/bmps/shippori-mincho/い.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -,,,,,,,,29,187,165 -,,,,,6,30,43,188,145,94 -,,,89,187,183,157,182,129,121, -3,47,172,203,65,,,1,179,74, -176,244,169,15,,,,,118,148, -,28,,,,,,,150,143, -,,,,,,,64,225,60, -,,,,,4,113,213,94,, -,,,90,155,175,127,26,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/お.alpha b/bmps/shippori-mincho/お.alpha deleted file mode 100644 index 1d25bf2..0000000 --- a/bmps/shippori-mincho/お.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -,,,,38,97,150,208,189 -46,50,133,174,114,136,12,,6 -93,178,68,1,113,26,,, -,,,2,164,,,, -,,,50,126,,,, -,,,80,95,,,, -,,,78,102,,,, -,,,31,189,10,,, -,,,,110,221,234,151, \ No newline at end of file diff --git a/bmps/shippori-mincho/で.alpha b/bmps/shippori-mincho/で.alpha deleted file mode 100644 index d194f72..0000000 --- a/bmps/shippori-mincho/で.alpha +++ /dev/null @@ -1,12 +0,0 @@ -1 -,,,,,,,,51,50,184,117 -,,,,,,,35,78,202,121,172 -,,,24,112,171,200,208,224,138,91, -132,121,186,209,139,204,32,,,,, -85,172,97,3,133,107,,,,,, -,,,1,206,13,,,,,, -,,,52,195,,,,,,, -,,,87,168,,,,,,, -,,,80,180,,,,,,, -,,,14,221,104,53,48,,,, -,,,,94,203,231,212,28,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/ず.alpha b/bmps/shippori-mincho/ず.alpha deleted file mode 100644 index a262040..0000000 --- a/bmps/shippori-mincho/ず.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -14,173,1,, -,201,5,, -,157,,, -8,128,,, -,152,40,117,43 -,118,171,97,18 -102,39,,, -153,,,, -182,11,,, -62,178,190,207,169 \ No newline at end of file diff --git a/bmps/shippori-mincho/ど.alpha b/bmps/shippori-mincho/ど.alpha deleted file mode 100644 index d917444..0000000 --- a/bmps/shippori-mincho/ど.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -18,195,51,,49,134,68 -,185,102,84,159,126,174 -,205,15,,101,154, -2,196,,,,, -,191,93,132,123,, -,143,207,144,75,, -142,120,1,,,, -205,1,,,,, -202,89,2,8,35,4, -59,182,215,220,214,79, \ No newline at end of file diff --git a/bmps/shippori-mincho/ăȘ.alpha b/bmps/shippori-mincho/ăȘ.alpha deleted file mode 100644 index 2302443..0000000 --- a/bmps/shippori-mincho/ăȘ.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,23,154,83,15,,, -62,72,211,168,16,,32, -25,127,124,,,,106,154 -,107,26,,,69,70,142 -3,153,,,35,63,, -90,95,,,57,70,, -202,13,,,51,91,, -82,,32,145,184,171,31, -,,125,16,71,180,198,76 -,,75,159,184,44,2,14 \ No newline at end of file diff --git a/bmps/shippori-mincho/に.alpha b/bmps/shippori-mincho/に.alpha deleted file mode 100644 index 9df0ea9..0000000 --- a/bmps/shippori-mincho/に.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -90,17,,3,,,5, -96,85,,40,151,198,207,52 -148,48,,,,,, -164,,,,,,, -136,39,,,,,, -171,77,,,,,, -234,47,,6,,,, -193,64,,102,141,118,137,133 -106,88,,,45,88,94,59 \ No newline at end of file diff --git a/bmps/shippori-mincho/く.alpha b/bmps/shippori-mincho/く.alpha deleted file mode 100644 index 2295a05..0000000 --- a/bmps/shippori-mincho/く.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -,2,84,91,98,111,155,35, -14,,92,131,,,28,190, -88,63,69,150,,,,177,28 -103,128,38,124,,,,151,53 -89,181,128,62,,,,161,43 -138,35,240,78,23,98,75,204,11 -167,110,124,,122,9,106,241,59 -172,143,3,,99,133,147,41,193 \ No newline at end of file diff --git a/bmps/shippori-mincho/ね.alpha b/bmps/shippori-mincho/ね.alpha deleted file mode 100644 index e93c278..0000000 --- a/bmps/shippori-mincho/ね.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,,141,57,,,,,, -,,81,103,,,,,, -,,103,80,,55,116,155,54, -15,132,184,203,95,48,,14,173, -98,8,115,173,15,,,,196, -35,46,177,10,,,,,188, -,164,124,21,,,,,193, -102,172,155,44,18,117,134,94,187, -183,13,224,63,92,5,19,213,211,94 -,,158,45,22,135,150,83,13,131 \ No newline at end of file diff --git a/bmps/shippori-mincho/た.alpha b/bmps/shippori-mincho/た.alpha deleted file mode 100644 index c8efa10..0000000 --- a/bmps/shippori-mincho/た.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -,2,96,104,134,110,126,25, -3,143,34,,90,,15,173,28 -111,59,,,125,,,46,158 -171,,,41,96,,,,205 -175,,,146,21,,,,210 -179,,39,145,,,,8,210 -162,89,188,29,,,,108,124 -35,189,62,,,2,108,150,4 -,,,33,81,123,69,, \ No newline at end of file diff --git a/bmps/shippori-mincho/は.alpha b/bmps/shippori-mincho/は.alpha deleted file mode 100644 index 0e4fd45..0000000 --- a/bmps/shippori-mincho/は.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -71,17,,,,55,195,, -78,115,,,,,189,42, -119,83,,10,56,38,194,216,48 -156,10,39,,61,131,174,14, -143,67,8,,,,146,, -141,104,,,,,159,, -226,104,,2,56,96,196,7, -218,77,,101,51,46,220,202,89 -108,98,,72,140,166,123,12,128 \ No newline at end of file diff --git a/bmps/shippori-mincho/ば.alpha b/bmps/shippori-mincho/ば.alpha deleted file mode 100644 index 7209499..0000000 --- a/bmps/shippori-mincho/ば.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -4,,,,,64,21,60,166,159 -130,74,,,,133,174,122,202,87 -106,155,,,,89,200,99,66, -139,119,6,60,134,157,221,195,6, -180,62,109,,85,164,149,1,, -187,145,19,,,79,142,,, -188,172,,,,69,159,,, -224,139,,44,142,174,197,29,, -201,125,,174,52,122,217,220,79, -112,134,,120,192,204,89,66,109, \ No newline at end of file diff --git a/bmps/shippori-mincho/ぱ.alpha b/bmps/shippori-mincho/ぱ.alpha deleted file mode 100644 index 74c0c69..0000000 --- a/bmps/shippori-mincho/ぱ.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -50,1,,,,94,93,68,176,158 -113,116,,,,58,217,135,62,174 -108,166,,,,24,216,171,166,81 -143,116,27,38,171,157,236,186,36, -184,61,121,,38,107,183,,, -190,147,24,,,11,191,,, -194,176,,,,3,200,,, -225,145,,41,153,180,222,70,, -197,135,,170,44,58,226,214,136, -107,143,,96,195,207,121,28,140, \ No newline at end of file diff --git a/bmps/shippori-mincho/ăČ.alpha b/bmps/shippori-mincho/ăČ.alpha deleted file mode 100644 index 12e0b35..0000000 --- a/bmps/shippori-mincho/ăČ.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -,,51,50,,76,88,, -118,173,214,43,,48,142,, -,109,27,,,17,196,7, -41,97,,,,,129,164,18 -146,10,,,,,116,60,188 -180,,,,,20,109,, -206,,,,,104,53,, -162,100,,,46,165,,, -14,157,209,197,164,20,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/び.alpha b/bmps/shippori-mincho/び.alpha deleted file mode 100644 index 131f6e2..0000000 --- a/bmps/shippori-mincho/び.alpha +++ /dev/null @@ -1,12 +0,0 @@ -1 -,,,,,,,11,179,159 -,,18,41,,85,114,168,135,102 -139,146,225,155,,93,167,12,175,4 -64,170,164,,,46,216,2,, -8,192,7,,,14,223,135,, -119,119,,,,,175,191,156, -196,33,,,,13,176,20,157,16 -216,4,,,,65,152,,, -215,54,,,,156,91,,, -143,192,69,35,131,195,3,,, -6,144,218,224,170,35,,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/ぎ.alpha b/bmps/shippori-mincho/ぎ.alpha deleted file mode 100644 index 56d4106..0000000 --- a/bmps/shippori-mincho/ぎ.alpha +++ /dev/null @@ -1,12 +0,0 @@ -1 -,,,,,,52,182,159 -,,39,29,,153,147,65,166 -142,158,229,108,,156,103,156,104 -63,183,122,,,135,138,, -17,182,,,,124,207,44, -128,97,,,,101,142,214,63 -195,12,,,,115,88,85,102 -210,,,,,150,55,, -213,35,,,5,199,3,, -147,180,58,55,172,130,,, -10,154,223,219,141,3,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/ご.alpha b/bmps/shippori-mincho/ご.alpha deleted file mode 100644 index fd340dc..0000000 --- a/bmps/shippori-mincho/ご.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -,,,1,104,121,5,,, -,,,,15,238,97,,, -,,,19,80,39,3,,, -,,,63,13,,,,, -,,,6,147,52,71,80,9, -,,,51,95,184,8,43,191,49 -14,44,132,59,,158,111,,48,214 -219,171,77,91,146,213,66,,,63 \ No newline at end of file diff --git a/bmps/shippori-mincho/ぶ.alpha b/bmps/shippori-mincho/ぶ.alpha deleted file mode 100644 index 11b5927..0000000 --- a/bmps/shippori-mincho/ぶ.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -,,,16,177,88,1,43,182,147 -,,,,46,244,92,168,168,123 -,,,6,174,164,54,6,147,1 -,,,134,36,,,,, -,,,97,114,,,,, -,,,1,199,181,164,187,85, -,,29,167,130,218,43,42,216,92 -117,133,201,64,43,203,128,,110,192 -195,175,141,161,190,198,62,,2,67 \ No newline at end of file diff --git a/bmps/shippori-mincho/ぷ.alpha b/bmps/shippori-mincho/ぷ.alpha deleted file mode 100644 index 54df4fc..0000000 --- a/bmps/shippori-mincho/ぷ.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -,,,9,182,121,1,46,167,80 -,,,,22,240,118,165,11,170 -,,,8,173,154,56,106,174,139 -,,,127,44,,,,, -,,,74,141,,1,,, -,,,,193,189,164,193,113, -,,30,169,124,216,64,22,204,127 -121,135,203,83,45,193,146,,79,219 -195,175,138,159,187,200,78,,,68 \ No newline at end of file diff --git a/bmps/shippori-mincho/ぞ.alpha b/bmps/shippori-mincho/ぞ.alpha deleted file mode 100644 index 3eaed85..0000000 --- a/bmps/shippori-mincho/ぞ.alpha +++ /dev/null @@ -1,5 +0,0 @@ -8 -,,30,133,125,39,,,, -,85,160,7,2,137,99,,, -164,158,7,,,,106,190,85,8 -,,,,,,,32,159,203 \ No newline at end of file diff --git a/bmps/shippori-mincho/ăč.alpha b/bmps/shippori-mincho/ăč.alpha deleted file mode 100644 index 564b354..0000000 --- a/bmps/shippori-mincho/ăč.alpha +++ /dev/null @@ -1,7 +0,0 @@ -6 -,,,,,,8,90,191,81 -,,,35,42,,50,192,138,37 -,,97,181,169,122,,8,38, -78,151,185,9,1,153,171,28,, -153,163,12,,,,118,219,147,49 -,,,,,,,46,166,200 \ No newline at end of file diff --git a/bmps/shippori-mincho/ăș.alpha b/bmps/shippori-mincho/ăș.alpha deleted file mode 100644 index 31ec5cc..0000000 --- a/bmps/shippori-mincho/ăș.alpha +++ /dev/null @@ -1,7 +0,0 @@ -6 -,,,,,,14,176,176,10 -,,,88,100,,54,134,139,44 -,2,141,158,133,165,9,121,119, -106,179,164,1,,120,195,54,, -136,148,4,,,,98,222,164,65 -,,,,,,,37,164,201 \ No newline at end of file diff --git a/bmps/shippori-mincho/ほ.alpha b/bmps/shippori-mincho/ほ.alpha deleted file mode 100644 index fdbfafb..0000000 --- a/bmps/shippori-mincho/ほ.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -68,84,,,78,78,132,127, -36,177,,,22,93,77,, -94,109,,,,4,189,36, -149,15,,16,71,76,195,204,71 -137,45,2,,26,63,157,1, -134,91,,,,,152,, -203,127,,,,27,173,, -184,123,,67,87,81,228,170,46 -53,139,,70,140,156,133,34,158 \ No newline at end of file diff --git a/bmps/shippori-mincho/ăŒ.alpha b/bmps/shippori-mincho/ăŒ.alpha deleted file mode 100644 index ae80f81..0000000 --- a/bmps/shippori-mincho/ăŒ.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -98,136,,,107,98,130,181,34,148,76 -36,225,,,58,145,169,60,159,122,158 -106,174,,,,7,208,124,48,188,3 -162,87,,28,127,107,207,217,159,, -194,78,69,,51,106,202,49,,, -192,172,5,,,,170,62,,, -210,186,,,23,83,182,93,,, -173,182,,97,162,104,214,218,134,1, -55,184,,70,183,194,175,41,167,60, \ No newline at end of file diff --git a/bmps/shippori-mincho/ăœ.alpha b/bmps/shippori-mincho/ăœ.alpha deleted file mode 100644 index 23547f1..0000000 --- a/bmps/shippori-mincho/ăœ.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -112,108,,36,105,108,166,97,140,86 -67,194,,2,98,174,105,121,70,168 -114,147,,,,107,186,69,167,141 -168,57,,77,110,152,222,204,13, -183,116,12,2,85,143,153,,, -182,163,,,,57,160,,, -209,162,,2,50,117,180,,, -177,154,,155,124,157,230,174,25, -68,161,,127,184,194,85,121,112, \ No newline at end of file diff --git a/bmps/shippori-mincho/ăŸ.alpha b/bmps/shippori-mincho/ăŸ.alpha deleted file mode 100644 index 97e2195..0000000 --- a/bmps/shippori-mincho/ăŸ.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,,11,187,4, -,,,155,1, -,51,133,211,148, -,,,119,44,7 -28,,,129,142,182 -84,139,143,196,81,8 -,,,141,, -6,79,90,178,, -122,23,22,206,184,68 -99,147,173,101,28,170 \ No newline at end of file diff --git a/bmps/shippori-mincho/み.alpha b/bmps/shippori-mincho/み.alpha deleted file mode 100644 index 5e5c8f2..0000000 --- a/bmps/shippori-mincho/み.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -,9,53,118,164,193,,,, -,,94,102,95,137,,,, -,,,19,158,2,8,3,, -,,,137,24,,9,173,, -,34,121,158,102,102,49,214,22, -71,78,168,5,,4,115,233,145,2 -125,118,82,,,,171,56,155,164 -186,154,,,,116,97,,,45 -,,,53,113,63,,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/む.alpha b/bmps/shippori-mincho/む.alpha deleted file mode 100644 index f26e308..0000000 --- a/bmps/shippori-mincho/む.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,36,192,7,,,,,, -16,,174,183,41,,,,, -96,144,205,87,2,,,,1, -,38,124,,,,,74,142,61 -87,72,209,17,,,,66,26,206 -128,6,189,,,,7,63,87,139 -60,168,174,,,,23,73,, -,117,94,,,,23,118,, -,115,21,,,,83,162,, -,36,155,157,184,186,162,33,, \ No newline at end of file diff --git a/bmps/shippori-mincho/め.alpha b/bmps/shippori-mincho/め.alpha deleted file mode 100644 index 7bd51e5..0000000 --- a/bmps/shippori-mincho/め.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -,,,16,173,,, -71,6,,,194,,, -39,107,97,130,196,154,107,1 -11,223,27,104,57,,112,113 -131,113,113,148,,,4,213 -150,,158,191,7,,1,232 -151,31,148,36,5,,55,189 -149,160,13,,,34,187,42 -,,,45,82,106,11, \ No newline at end of file diff --git a/bmps/shippori-mincho/も.alpha b/bmps/shippori-mincho/も.alpha deleted file mode 100644 index 9e23132..0000000 --- a/bmps/shippori-mincho/も.alpha +++ /dev/null @@ -1,12 +0,0 @@ -1 -,111,65,,, -,66,123,,, -85,136,55,,, -7,159,233,41,, -1,142,52,4,, -73,110,1,79,56, -155,134,29,1,126,52 -42,183,156,19,11,180 -3,112,,,,207 -,145,3,,70,193 -,62,180,191,177,29 \ No newline at end of file diff --git a/bmps/shippori-mincho/ゃ.alpha b/bmps/shippori-mincho/ゃ.alpha deleted file mode 100644 index 7950103..0000000 --- a/bmps/shippori-mincho/ゃ.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -,61,95,106,114,,, -,157,,52,162,111,113,29 -,121,100,119,23,,6,166 -68,179,156,9,79,15,19,181 -61,43,120,28,23,134,154,42 -,,22,140,,,, -,,,192,11,,, -,,,132,54,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/や.alpha b/bmps/shippori-mincho/や.alpha deleted file mode 100644 index 7a99214..0000000 --- a/bmps/shippori-mincho/や.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,11,72,59,70,117,,,, -,163,57,39,116,168,40,54,14, -,134,22,14,116,124,88,63,131,106 -,16,170,171,32,,,,,197 -72,160,209,57,10,99,33,,50,200 -59,92,6,158,,15,141,196,170,38 -,,,117,58,,,,, -,,,36,173,,,,, -,,,,225,25,,,, -,,,,155,64,,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/ゅ.alpha b/bmps/shippori-mincho/ゅ.alpha deleted file mode 100644 index 3bde178..0000000 --- a/bmps/shippori-mincho/ゅ.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -73,,42,163,124,69, -161,2,128,14,126,44,111 -127,91,96,,140,,145 -122,103,115,,148,,152 -200,67,128,6,148,11,162 -99,73,36,167,206,186,44 -,,,95,57,4, -,,50,53,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/ゆ.alpha b/bmps/shippori-mincho/ゆ.alpha deleted file mode 100644 index e831865..0000000 --- a/bmps/shippori-mincho/ゆ.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -69,,,56,139,142,73,8, -161,37,4,145,52,133,26,134,32 -156,11,119,62,,92,70,11,155 -138,49,123,50,,76,95,,169 -139,127,39,80,,82,94,,183 -187,136,9,147,,110,71,22,176 -121,157,,129,112,172,76,191,53 -5,54,,1,110,211,142,39, -,,,,118,20,,, -,,2,73,26,,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/ょ.alpha b/bmps/shippori-mincho/ょ.alpha deleted file mode 100644 index a8869bc..0000000 --- a/bmps/shippori-mincho/ょ.alpha +++ /dev/null @@ -1,9 +0,0 @@ -4 -,,71,144,, -,,3,165,, -,,,193,163,95 -,,,143,, -,,,150,, -,6,32,170,, -124,98,102,227,159,48 -126,130,162,127,34,132 \ No newline at end of file diff --git a/bmps/shippori-mincho/よ.alpha b/bmps/shippori-mincho/よ.alpha deleted file mode 100644 index e8f6bd9..0000000 --- a/bmps/shippori-mincho/よ.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,,6,184,53,, -,,,128,70,, -,,,118,53,61,40 -,,,114,155,141,59 -,,,105,50,, -,,,93,64,, -,,,81,93,, -32,119,140,180,155,9, -142,10,,100,196,217,98 -117,152,167,188,36,18,112 \ No newline at end of file diff --git a/bmps/shippori-mincho/ら.alpha b/bmps/shippori-mincho/ら.alpha deleted file mode 100644 index 720c835..0000000 --- a/bmps/shippori-mincho/ら.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,34,182,28,, -37,81,138,63,, -133,,,,, -160,,,,, -153,,,,, -147,,76,77,113,48 -211,179,100,,2,183 -99,110,,,6,222 -,,,8,155,112 -1,58,75,107,39, \ No newline at end of file diff --git a/bmps/shippori-mincho/り.alpha b/bmps/shippori-mincho/り.alpha deleted file mode 100644 index 8ecfe47..0000000 --- a/bmps/shippori-mincho/り.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -110,24,, -101,39,, -129,97,141,46 -170,64,8,170 -213,,,183 -199,,,191 -117,22,1,191 -,,56,132 -,3,159,20 -25,93,26, \ No newline at end of file diff --git a/bmps/shippori-mincho/る.alpha b/bmps/shippori-mincho/る.alpha deleted file mode 100644 index fa3b868..0000000 --- a/bmps/shippori-mincho/る.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -,47,77,165,178,56, -,68,158,54,210,54, -,,5,167,49,, -,,136,40,,, -,115,162,89,95,139,40 -75,204,15,,,11,187 -217,42,,,,,206 -28,,142,168,74,89,165 -,,127,152,217,140,9 \ No newline at end of file diff --git a/bmps/shippori-mincho/れ.alpha b/bmps/shippori-mincho/れ.alpha deleted file mode 100644 index a62fb4e..0000000 --- a/bmps/shippori-mincho/れ.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,25,169,13,,,,,,, -,,156,31,,18,93,48,,, -,,149,11,76,93,35,189,20,, -64,123,219,179,43,,,167,33,, -92,6,210,47,,,,203,2,, -79,119,174,,,,21,185,,, -66,185,134,,,,66,142,,,34 -161,121,141,,,,74,145,,38,83 -120,82,195,,,,8,171,154,113, -,18,192,,,,,,,, \ No newline at end of file diff --git a/bmps/shippori-mincho/ろ.alpha b/bmps/shippori-mincho/ろ.alpha deleted file mode 100644 index 1bf0576..0000000 --- a/bmps/shippori-mincho/ろ.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -,,43,178,213,1,, -,97,185,116,128,,, -,,12,158,2,,, -,,130,33,42,69,32, -,77,186,118,74,74,179,112 -28,204,28,,,,7,225 -186,101,,,,,12,203 -145,12,,,,14,161,58 -,,,11,72,96,22, \ No newline at end of file diff --git a/bmps/shippori-mincho/わ.alpha b/bmps/shippori-mincho/わ.alpha deleted file mode 100644 index 73c741c..0000000 --- a/bmps/shippori-mincho/わ.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,,137,33,,,,, -,,119,60,,,,, -,,132,17,,,,, -,26,212,134,57,90,125,71, -126,139,203,118,33,,1,113,117 -44,58,166,,,,,1,217 -13,169,124,,,,,10,228 -167,135,160,,,,,120,133 -90,51,195,,,,90,149,4 -,3,137,,53,90,61,, \ No newline at end of file diff --git a/bmps/shippori-mincho/ゐ.alpha b/bmps/shippori-mincho/ゐ.alpha deleted file mode 100644 index 0b0cfe5..0000000 --- a/bmps/shippori-mincho/ゐ.alpha +++ /dev/null @@ -1,10 +0,0 @@ -3 -,66,110,188,198,,,, -,128,163,118,173,8,9,, -,,,177,193,162,173,175,20 -,6,162,184,1,,,131,146 -21,191,197,101,,,,47,210 -171,76,200,11,,,,25,228 -162,85,175,,15,45,,84,207 -148,213,105,36,193,199,131,197,117 -40,150,6,40,191,203,200,111, \ No newline at end of file diff --git a/bmps/shippori-mincho/を.alpha b/bmps/shippori-mincho/を.alpha deleted file mode 100644 index a9350bd..0000000 --- a/bmps/shippori-mincho/を.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,,119,88,21,,, -34,30,132,203,53,,, -26,96,154,3,,,6,5 -,26,103,,,80,78,181 -,140,132,95,77,27,99,167 -88,165,1,133,152,125,81, -187,11,21,170,85,,, -,24,97,140,52,,, -,82,40,55,11,,, -,14,163,176,189,187,9, \ No newline at end of file diff --git a/bmps/shippori-mincho/ん.alpha b/bmps/shippori-mincho/ん.alpha deleted file mode 100644 index 3d3ba6f..0000000 --- a/bmps/shippori-mincho/ん.alpha +++ /dev/null @@ -1,11 +0,0 @@ -2 -,,,,157,13,,,, -,,,10,229,31,,,, -,,,141,110,,,,, -,,54,134,,,,,, -,5,155,102,107,116,1,,, -,120,167,18,,143,58,,, -18,211,12,,,131,69,,,66 -119,103,,,,149,45,,11,97 -222,33,,,,155,60,12,146,16 -191,,,,,55,200,176,37, \ No newline at end of file diff --git a/build.rs b/build.rs index 711dc84..4db1875 100644 --- a/build.rs +++ b/build.rs @@ -48,7 +48,7 @@ fn font_chars_to_alphas(dir: &str) { fn main() { //hash + "salt" password and add to build - let password = read_to_string("password.txt").unwrap_or("password".to_string()).replace("\n", "") + "salt?sorrycryptographers"; + let password = read_to_string("password.txt").unwrap_or("incorrect mule lightbulb niche".to_string()).replace("\n", "") + "salt?sorrycryptographers"; let mut hasher = Blake2b512::new(); hasher.update(password.as_bytes()); let out_dir = env::var_os("OUT_DIR").unwrap(); diff --git a/docs/system/README.md b/docs/system/README.md index affcde3..cb614c6 100644 --- a/docs/system/README.md +++ b/docs/system/README.md @@ -2,7 +2,7 @@ > If reading this in the "About" app inside ming-wm, use the 'j' and 'k' keys to scroll. > Recommended reading music: Hegira by such -Ming-wm, as the name implies, is great at liberating the nation of Mongol hordes, and great at collapsing when invaded by Jurchens. +Ming-wm, as the name implies, is great at liberating the nation of Mongol hordes, and great at collapsing when invaded by Jurchens. It is licensed under the GPLv3. Also, it is a window manager. The window manager manages "window-likes": diff --git a/docs/window-likes/audio-player.md b/docs/window-likes/audio-player.md index 0bde4e6..90bd51b 100644 --- a/docs/window-likes/audio-player.md +++ b/docs/window-likes/audio-player.md @@ -8,8 +8,9 @@ Type to write commands, backspace to delete last character, and enter to run com - `l`: Next/skip - `j`: Volume down - `k`: Volume up -- `b `: Set base directory (`` is path) +- `b `: Set base directory (`` is path). Unless paths are absolute, they will be relative to what the base directory currently is (by default, `$HOME` is set, `/` otherwise) - `p `: Play audio files in `` or play the songs listed in the ``. Unless paths are absolute, they will be relative to the directory specified by the `b ` command +- `a `: Same as `p` but appends to the end of the queue instead of clearing the current song and the queue ## Playlists @@ -19,5 +20,8 @@ Example playlist file: hanyuu-maigo/ă‚Șノマトペ inabakumori/* iyowa/* -kai/さよăȘらプăƒȘăƒłă‚»ă‚č +such/Hegira ``` + +If there is no file extension, the player assumes `.mp3`. + diff --git a/docs/window-likes/desktop-background.md b/docs/window-likes/desktop-background.md index 903dd54..a03112c 100644 --- a/docs/window-likes/desktop-background.md +++ b/docs/window-likes/desktop-background.md @@ -19,3 +19,26 @@ r./bmps/castle1440x842.bmp r./bmps/ming1440x842.bmp r./bmps/blur1440x842.bmp ``` + +## Unrelated: Themes Config + +Not handled by the desktop background, but here anyways. To configure, create `$XDG_CONFIG_DIR/ming-wm/desktop-background`. + +Example: + +``` +Standard +Standard +Standard +Standard +Standard +Forest +Royal +Industrial +Night +``` + +This would set the first 5 workspaces to the Standard theme, with the 6th being Forest theme, 7th being Royal theme, 8th being Industrial theme, and the 9th being Night theme. Those are currently all the themes available. The Forest and Royal themes only differ from the Standard theme in their window decoration (the window top) colour. + +Editing `/src/themes.rs` and re-compiling is the only way to make new themes. Feel free to open a PR if an especially pleasant theme is made. + diff --git a/docs/window-likes/file-explorer.md b/docs/window-likes/file-explorer.md new file mode 100644 index 0000000..594092f --- /dev/null +++ b/docs/window-likes/file-explorer.md @@ -0,0 +1,9 @@ +Barebones file explorer. + +## Navigation + +- `j`: Move down +- `k`: Move up +- `i`: See info about current file / directory (press any key to escape info screen) +- `Enter`: Go into directory + diff --git a/docs/window-likes/lock-screen.md b/docs/window-likes/lock-screen.md index ce5f845..6bbcdb3 100644 --- a/docs/window-likes/lock-screen.md +++ b/docs/window-likes/lock-screen.md @@ -2,4 +2,5 @@ Shown when screen is locked. Unlocks the screen when correct password is entered ## Config -Before building, create a `password.txt` in the same directory as the `build.rs` file with the password. +Before building, create a `password.txt` in the same directory as the `build.rs` file with the password. Remove the file after building. + diff --git a/docs/window-likes/start-menu.md b/docs/window-likes/start-menu.md new file mode 100644 index 0000000..9780264 --- /dev/null +++ b/docs/window-likes/start-menu.md @@ -0,0 +1,10 @@ +The start menu, which can be opened and closed with the [Alt+s shortcut](../system/shortcuts.md). + +## Navigation + +Use the 'j' and 'k' keys to move down and up respectively. Going down past the last option returns the selection to the first option, and vice versa (it loops). + +Hitting the 'enter' key will either open a subfolder containing window-likes, if a category is selected, or the corresponding window-like, if a window-like is selected. It may also exit a subfolder and return to the category selection if "Back" is selected and 'enter' is hit. There is another special case: hitting 'enter' while the "Logout" option is selected will, as the name implies, logout and return to the lock screen (this does not log out of the Linux user!). + +For faster navigation, hitting any lower-case letter (besides 'j' and 'k') will move the selection to the next option that starts with that letter (non-looping). For example, when first opening the start menu, hitting 'e' will move the selection to "Editing". Hitting any upper-case letter will move the selection to any previous option that starts with that letter (also non-looping). For example, when initially opening the start menu, the selected option is "About". After hitting 'j' (moving down), hitting 'A' will return the selection to "About". + diff --git a/docs/window-likes/terminal.md b/docs/window-likes/terminal.md new file mode 100644 index 0000000..ccd093e --- /dev/null +++ b/docs/window-likes/terminal.md @@ -0,0 +1,21 @@ +A basic, line-buffered, modal terminal. + +## Usage + +The terminal displays the current mode in the lower left corner. The possible modes are "INPUT", "RUNNING", "STDIN". + +The terminal starts off in INPUT mode, which allows entering commands to run. If `$HOME` is set, the starting directory is that. Otherwise, it is root (`/`). + +In INPUT mode, commands can be freely typed. There are a few special control sequences: + +- `ctrl+p`: Brings up the last run command to the command input +- `ctrl+n`: Clears the command input + +Once a command is entered, hit 'enter' to execute it. The terminal will change into "RUNNING" mode. In this mode, clicking any key except for 'i' will result in the terminal writing the current output of the running command to the window (`ctrl+c` will force the process to exit). It will also check if the command has exited, in which case the INPUT mode is returned to. Clicking the 'i' key will change the terminal to "STDIN" mode. + +In STDIN mode, any keys typed followed by the 'enter' key will send those keys to the command's STDIN, if it is still running. To escape STDIN mode, use the `esc` key. + +## Copy / Paste + +This window-like supports the paste [shortcut](../system/shortcuts.md) (`Alt+P`) if in INPUT or STDIN mode. + diff --git a/src/bin/audio_player.rs b/src/bin/audio_player.rs index ecd1ed8..8ce0834 100644 --- a/src/bin/audio_player.rs +++ b/src/bin/audio_player.rs @@ -3,10 +3,15 @@ use std::vec; use std::io::BufReader; use std::path::PathBuf; use std::fs::{ read_to_string, File }; +use std::time::{ Duration, SystemTime, UNIX_EPOCH }; +use std::thread; +use std::sync::{ Arc, Mutex }; use rodio::{ Decoder, OutputStream, Sink, Source }; -use rand::prelude::*; -use audiotags::Tag; +use rand::{ SeedableRng, prelude::SliceRandom, rngs::SmallRng }; +use id3::TagLike; +use mp4ameta; +use metaflac; use ming_wm::window_manager::{ DrawInstructions, WindowLike, WindowLikeType }; use ming_wm::messages::{ WindowMessage, WindowMessageResponse }; @@ -14,24 +19,67 @@ use ming_wm::framebuffer::Dimensions; use ming_wm::themes::ThemeInfo; use ming_wm::utils::{ concat_paths, format_seconds, Substring }; use ming_wm::fs::get_all_files; +use ming_wm::dirs::home; use ming_wm::ipc::listen; +fn get_artist(path: &PathBuf) -> Option { + let ext = path.extension().unwrap(); + if ext == "mp4" { + let tag = mp4ameta::Tag::read_from_path(path).unwrap(); + tag.artist().map(|s| s.to_string()) + } else if ext == "flac" { + let tag = metaflac::Tag::read_from_path(path).unwrap(); + if let Some(mut artists) = tag.get_vorbis("Artist") { + Some(artists.next().unwrap().to_string()) //get the first one + } else { + None + } + } else if ext == "mp3" { + let tag = id3::Tag::read_from_path(path).unwrap(); + tag.artist().map(|s| s.to_string()) + } else { + None + } +} + const MONO_WIDTH: u8 = 10; const LINE_HEIGHT: usize = 18; -#[derive(Default)] -struct AudioPlayer { +type QueueItem = (PathBuf, u64, Option); + +struct InternalPlayer { + pub queue: Vec, + pub sink: Sink, +} + +impl InternalPlayer { + fn add(internal: Arc>, queue: Vec) { + thread::spawn(move || { + for item in queue { + let file = BufReader::new(File::open(&item).unwrap()); + //slightly faster for mp3s? since it doesn't need to check if it is .wav, etc. but maybe not + let decoded = if item.ends_with(".mp3") { Decoder::new_mp3(file) } else { Decoder::new(file) }.unwrap(); + let mut internal_locked = internal.lock().unwrap(); + (*internal_locked).queue.push((item.clone(), decoded.total_duration().unwrap().as_secs(), get_artist(&item))); + (*internal_locked).sink.append(decoded); + (*internal_locked).sink.play(); + } + }); + } +} + +pub struct AudioPlayer { dimensions: Dimensions, base_directory: String, - queue: Vec<(PathBuf, u64, Option)>, - stream: Option>, - sink: Option, + _stream: Box, + internal: Arc>, command: String, response: String, } impl WindowLike for AudioPlayer { fn handle_message(&mut self, message: WindowMessage) -> WindowMessageResponse { + // match message { WindowMessage::Init(dimensions) => { self.dimensions = dimensions; @@ -62,18 +110,19 @@ impl WindowLike for AudioPlayer { fn draw(&self, theme_info: &ThemeInfo) -> Vec { let mut instructions = vec![DrawInstructions::Text([2, self.dimensions[1] - LINE_HEIGHT], vec!["nimbus-roman".to_string()], if self.command.len() > 0 { self.command.clone() } else { self.response.clone() }, theme_info.text, theme_info.background, None, None)]; - if let Some(sink) = &self.sink { - if sink.len() > 0 { - let current = &self.queue[self.queue.len() - sink.len()]; - let current_name = current.0.file_name().unwrap().to_string_lossy().into_owned(); - instructions.push(DrawInstructions::Text([self.dimensions[0] / 2 - current_name.len() * MONO_WIDTH as usize / 2, 2], vec!["nimbus-romono".to_string(), "shippori-mincho".to_string()], current_name.clone(), theme_info.text, theme_info.background, Some(0), Some(MONO_WIDTH))); - if let Some(artist) = ¤t.2 { - let artist_string = "by ".to_string() + &artist; - instructions.push(DrawInstructions::Text([self.dimensions[0] / 2 - artist_string.len() * MONO_WIDTH as usize / 2, LINE_HEIGHT + 2], vec!["nimbus-romono".to_string()], artist_string, theme_info.text, theme_info.background, Some(0), Some(MONO_WIDTH))); - } - let time_string = format!("{}/{}", format_seconds(sink.get_pos().as_secs()), format_seconds(current.1)); - instructions.push(DrawInstructions::Text([self.dimensions[0] / 2 - time_string.len() * MONO_WIDTH as usize / 2, LINE_HEIGHT * 2 + 2], vec!["nimbus-romono".to_string()], time_string, theme_info.text, theme_info.background, Some(0), Some(MONO_WIDTH))); + let internal_locked = self.internal.lock().unwrap(); + let sink_len = internal_locked.sink.len(); + if sink_len > 0 { + let queue = &internal_locked.queue; + let current = &queue[queue.len() - sink_len]; + let current_name = current.0.file_name().unwrap().to_string_lossy().into_owned(); + instructions.push(DrawInstructions::Text([self.dimensions[0] / 2 - current_name.len() * MONO_WIDTH as usize / 2, 2], vec!["nimbus-romono".to_string(), "shippori-mincho".to_string()], current_name.clone(), theme_info.text, theme_info.background, Some(0), Some(MONO_WIDTH))); + if let Some(artist) = ¤t.2 { + let artist_string = "by ".to_string() + &artist; + instructions.push(DrawInstructions::Text([self.dimensions[0] / 2 - artist_string.len() * MONO_WIDTH as usize / 2, LINE_HEIGHT + 2], vec!["nimbus-romono".to_string()], artist_string, theme_info.text, theme_info.background, Some(0), Some(MONO_WIDTH))); } + let time_string = format!("{}/{}", format_seconds(internal_locked.sink.get_pos().as_secs()), format_seconds(current.1)); + instructions.push(DrawInstructions::Text([self.dimensions[0] / 2 - time_string.len() * MONO_WIDTH as usize / 2, LINE_HEIGHT * 2 + 2], vec!["nimbus-romono".to_string()], time_string, theme_info.text, theme_info.background, Some(0), Some(MONO_WIDTH))); } else { instructions.push(DrawInstructions::Text([2, 2], vec!["nimbus-roman".to_string()], "type to write commands, enter to execute.".to_string(), theme_info.text, theme_info.background, None, None)); instructions.push(DrawInstructions::Text([2, 2 + LINE_HEIGHT], vec!["nimbus-roman".to_string()], "See help in start menu for commands.".to_string(), theme_info.text, theme_info.background, None, None)); @@ -103,9 +152,18 @@ impl WindowLike for AudioPlayer { impl AudioPlayer { pub fn new() -> Self { - let mut ap: Self = Default::default(); - ap.base_directory = "/".to_string(); - ap + let (stream, stream_handle) = OutputStream::try_default().unwrap(); + Self { + dimensions: Default::default(), + base_directory: home().unwrap_or(PathBuf::from("/")).to_string_lossy().to_string(), + _stream: Box::new(stream), + internal: Arc::new(Mutex::new(InternalPlayer { + queue: Vec::new(), + sink: Sink::try_new(&stream_handle).unwrap(), + })), + command: Default::default(), + response: Default::default(), + } } //t: toggle pause/play @@ -114,41 +172,35 @@ impl AudioPlayer { //k: volume up //b : set base directory //p /: play directory or playlist in random order - //todo: h for help? + //a /: same as p but appends to queue instead of clearing //just hit enter or any key to refresh fn process_command(&mut self) -> String { if self.command.len() == 1 { - if let Some(sink) = &mut self.sink { - if self.command == "t" { - if sink.is_paused() { - sink.play(); - return "Resumed".to_string(); - } else { - sink.pause(); - return "Paused".to_string(); - } - } else if self.command == "h" { - // - } else if self.command == "l" { - sink.skip_one(); - return "Skipped".to_string(); - } else if self.command == "j" { - sink.set_volume(sink.volume() - 0.1); - return "Volume decreased".to_string(); - } else if self.command == "k" { - sink.set_volume(sink.volume() + 0.1); - return "Volume increased".to_string(); + let sink = &(*self.internal.lock().unwrap()).sink; + if self.command == "t" { + if sink.is_paused() { + sink.play(); + return "Resumed".to_string(); + } else { + sink.pause(); + return "Paused".to_string(); } + } else if self.command == "l" { + sink.skip_one(); + return "Skipped".to_string(); + } else if self.command == "j" { + sink.set_volume(sink.volume() - 0.1); + return "Volume decreased".to_string(); + } else if self.command == "k" { + sink.set_volume(sink.volume() + 0.1); + return "Volume increased".to_string(); } } else { let parts: Vec<&str> = self.command.split(" ").collect(); - if self.command.starts_with("p ") { + if self.command.starts_with("p ") || self.command.starts_with("a ") { if parts.len() == 2 { if let Ok(new_path) = concat_paths(&self.base_directory, parts[1]) { if new_path.exists() { - if let Some(sink) = &mut self.sink { - sink.clear(); - } let mut queue = if parts[1].ends_with(".playlist") { let mut queue = Vec::new(); let contents = read_to_string(new_path).unwrap(); @@ -157,34 +209,36 @@ impl AudioPlayer { if line.ends_with("/*") { queue.extend(get_all_files(concat_paths(&self.base_directory, &line[..line.len() - 2]).unwrap())); } else if line.len() > 0 { - queue.push(concat_paths(&self.base_directory, &(line.to_owned() + if line.ends_with(".mp3") { "" } else { ".mp3" })).unwrap()); + //if no file ext, assumes mp3 + queue.push(concat_paths(&self.base_directory, &(line.to_owned() + if line.contains(".") { "" } else { ".mp3" })).unwrap()); } } queue } else { get_all_files(PathBuf::from(new_path)) }; - let mut rng = rand::thread_rng(); + let mut rng = SmallRng::seed_from_u64(SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs()); queue.shuffle(&mut rng); - let (stream, stream_handle) = OutputStream::try_default().unwrap(); - let sink = Sink::try_new(&stream_handle).unwrap(); - self.queue = Vec::new(); - for item in &queue { - let file = BufReader::new(File::open(item).unwrap()); - //slightly faster for mp3s? since it doesn't need to check if it is .wav, etc. but maybe not - let decoded = if item.ends_with(".mp3") { Decoder::new_mp3(file) } else { Decoder::new(file) }.unwrap(); - self.queue.push((item.clone(), decoded.total_duration().unwrap().as_secs(), Tag::new().read_from_path(item.clone()).unwrap().artist().map(|s| s.to_string()))); - sink.append(decoded); + if self.command.starts_with("p ") { + let mut locked_internal = self.internal.lock().unwrap(); + (*locked_internal).sink.clear(); + (*locked_internal).queue = Vec::new(); } - self.stream = Some(Box::new(stream)); - self.sink = Some(sink); - return "Playing".to_string(); + InternalPlayer::add(Arc::clone(&self.internal), queue); + //to hopefully allow the first file to be loaded so info displays + thread::sleep(Duration::from_millis(10)); + return if self.command.starts_with("p ") { + "Playing".to_string() + } else { + "Appended".to_string() + }; } } } } else if self.command.starts_with("b ") { if parts.len() == 2 { - if let Ok(new_path) = concat_paths(&self.base_directory, parts[1]) { + let new_path = if parts[1].starts_with("/") { Ok(PathBuf::from(parts[1])) } else { concat_paths(&self.base_directory, parts[1]) }; + if let Ok(new_path) = new_path { if new_path.exists() { self.base_directory = new_path.to_str().unwrap().to_string(); return "Set new base directory".to_string(); diff --git a/src/bin/file_explorer.rs b/src/bin/file_explorer.rs index dc975ad..2d1a1d8 100644 --- a/src/bin/file_explorer.rs +++ b/src/bin/file_explorer.rs @@ -139,6 +139,7 @@ impl WindowLike for FileExplorer { instructions.push(DrawInstructions::Text([5, start_y], vec!["nimbus-roman".to_string()], format!("Size: {} mb ({} b)", bytes_len / (1024_u64).pow(2), bytes_len), theme_info.text, theme_info.background, None, None)); start_y += HEIGHT; //todo: other stuff + // } instructions } diff --git a/src/bin/main.rs b/src/bin/main.rs index 2ec4b17..40477cd 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -104,7 +104,7 @@ fn init(framebuffer: Framebuffer, framebuffer_info: FramebufferInfo) { } if x.is_some() && y.is_some() { let (x2, y2) = if rotate { - (y.unwrap(), dimensions[0] - x.unwrap()) + (dimensions[0] - y.unwrap(), x.unwrap()) } else { (x.unwrap(), y.unwrap()) }; diff --git a/src/bin/malvim.rs b/src/bin/malvim.rs index 5c05042..29f8cb5 100644 --- a/src/bin/malvim.rs +++ b/src/bin/malvim.rs @@ -9,6 +9,7 @@ use ming_wm::themes::ThemeInfo; use ming_wm::framebuffer::Dimensions; use ming_wm::window_manager::{ DrawInstructions, WindowLike, WindowLikeType }; use ming_wm::utils::{ calc_actual_lines, calc_new_cursor_pos, Substring }; +use ming_wm::dirs::home; use ming_wm::ipc::listen; const MONO_WIDTH: u8 = 10; @@ -496,8 +497,10 @@ impl Malvim { let mut failed = false; let mut new_path = if self.files.len() > 0 && !arg.starts_with("/") { PathBuf::from(self.files[self.current_file_index].path.clone()).parent().unwrap().to_path_buf() - } else { + } else if arg.starts_with("/") { PathBuf::from("/") + } else { + home().unwrap_or(PathBuf::from("/")) }; for part in arg.split("/") { if part == ".." { diff --git a/src/bin/terminal.rs b/src/bin/terminal.rs index c592cfc..38c2ebb 100644 --- a/src/bin/terminal.rs +++ b/src/bin/terminal.rs @@ -1,36 +1,86 @@ use std::vec::Vec; use std::vec; -use std::process::{ Command, Child, Stdio }; -use std::io::Read; +use std::sync::mpsc::{ channel, Receiver, Sender }; +use std::thread; +use std::process::{ Child, Stdio }; +use std::io::{ BufReader, BufRead, Write }; +use std::time::Duration; +use std::path::PathBuf; +use std::fmt; + +use pty_process::blocking; use ming_wm::window_manager::{ DrawInstructions, WindowLike, WindowLikeType }; use ming_wm::messages::{ WindowMessage, WindowMessageResponse }; use ming_wm::framebuffer::Dimensions; use ming_wm::themes::ThemeInfo; use ming_wm::utils::{ concat_paths, Substring }; +use ming_wm::dirs::home; use ming_wm::ipc::listen; +//todo: support copy and paste + const MONO_WIDTH: u8 = 10; const LINE_HEIGHT: usize = 15; const PADDING: usize = 4; +//at least the ones that starts with ESC[ +fn strip_ansi_escape_codes(line: String) -> String { + let mut new_line = String::new(); + let mut in_ansi = false; + let mut lc = line.chars().peekable(); + loop { + let c = lc.next(); + if c.is_none() { + break; + } + let c = c.unwrap(); + if c == '\x1B' && lc.peek() == Some(&'[') { + in_ansi = true; + } else if in_ansi { + if c.is_alphabetic() { + in_ansi = false; + } + } else { + new_line += &c.to_string() + } + } + new_line +} + #[derive(Default, PartialEq)] -enum State { +enum Mode { #[default] Input, //typing in to run command - Running, //running command + Running, //running command, key presses trigger writing output + Stdin, //key presses writing to stdin of a running command +} + +impl fmt::Display for Mode { + fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + let write_str = match self { + Mode::Input=> "INPUT", + Mode::Running => "RUNNING ('i' to stdin, else output)", + Mode::Stdin => "STDIN ('esc' to return, 'enter' to send)", + }; + fmt.write_str(write_str)?; + Ok(()) + } } #[derive(Default)] pub struct Terminal { dimensions: Dimensions, - state: State, + mode: Mode, lines: Vec, actual_lines: Vec, //wrapping actual_line_num: usize, //what line # is at the top, for scrolling current_input: String, + current_stdin_input: String, current_path: String, running_process: Option, + pty_outerr_rx: Option>, + pty_in_tx: Option>, last_command: Option, } @@ -41,7 +91,7 @@ impl WindowLike for Terminal { match message { WindowMessage::Init(dimensions) => { self.dimensions = dimensions; - self.current_path = "/".to_string(); + self.current_path = home().unwrap_or(PathBuf::from("/")).to_string_lossy().to_string(); self.lines = vec!["Mingde Terminal".to_string(), "".to_string()]; self.calc_actual_lines(); WindowMessageResponse::JustRedraw @@ -51,60 +101,94 @@ impl WindowLike for Terminal { WindowMessageResponse::JustRedraw }, WindowMessage::KeyPress(key_press) => { - if self.state == State::Input { - if key_press.key == '𐘁' { //backspace - if self.current_input.len() > 0 { - self.current_input = self.current_input.remove_last(); + match self.mode { + Mode::Input => { + if key_press.key == '𐘁' { //backspace + if self.current_input.len() > 0 { + self.current_input = self.current_input.remove_last(); + } else { + return WindowMessageResponse::DoNothing; + } + } else if key_press.key == '𐘂' { //the enter key + self.lines.push("$ ".to_string() + &self.current_input); + self.last_command = Some(self.current_input.clone()); + self.mode = self.process_command(); + self.current_input = String::new(); } else { - return WindowMessageResponse::DoNothing; + self.current_input += &key_press.key.to_string(); } - } else if key_press.key == '𐘂' { //the enter key - self.lines.push("$ ".to_string() + &self.current_input); - self.last_command = Some(self.current_input.clone()); - self.state = self.process_command(); - self.current_input = String::new(); - } else { - self.current_input += &key_press.key.to_string(); - } - self.calc_actual_lines(); - self.actual_line_num = self.actual_lines.len().checked_sub(self.get_max_lines()).unwrap_or(0); - WindowMessageResponse::JustRedraw - } else { - //update - let running_process = self.running_process.as_mut().unwrap(); - if let Some(status) = running_process.try_wait().unwrap() { - //process exited - let mut output = String::new(); - if status.success() { - let _ = running_process.stdout.as_mut().unwrap().read_to_string(&mut output); + self.calc_actual_lines(); + self.actual_line_num = self.actual_lines.len().checked_sub(self.get_max_lines()).unwrap_or(0); + WindowMessageResponse::JustRedraw + }, + Mode::Running => { + //update + let mut changed = false; + loop { + if let Ok(line) = self.pty_outerr_rx.as_mut().unwrap().recv_timeout(Duration::from_millis(5)) { + self.lines.push(strip_ansi_escape_codes(line)); + changed = true; + } else { + break; + } + } + let running_process = self.running_process.as_mut().unwrap(); + if let Some(_status) = running_process.try_wait().unwrap() { + //process exited + self.mode = Mode::Input; + changed = true; } else { - let _ = running_process.stderr.as_mut().unwrap().read_to_string(&mut output); + if key_press.key == 'i' { + self.mode = Mode::Stdin; + changed = true; + } } - for line in output.split("\n") { - self.lines.push(line.to_string()); + if changed { + self.calc_actual_lines(); + WindowMessageResponse::JustRedraw + } else { + WindowMessageResponse::DoNothing + } + }, + Mode::Stdin => { + if key_press.key == '𐘃' { + //esc + self.mode = Mode::Running; + } else if key_press.key == '𐘂' { + //enter + let _ = self.pty_in_tx.as_mut().unwrap().send(self.current_stdin_input.clone()); + self.mode = Mode::Running; + self.current_stdin_input = String::new(); + } else if key_press.key == '𐘁' { + //backspace + if self.current_stdin_input.len() > 0 { + self.current_stdin_input = self.current_stdin_input.remove_last(); + } else { + return WindowMessageResponse::DoNothing; + } + } else { + self.current_stdin_input += &key_press.key.to_string(); } - self.state = State::Input; self.calc_actual_lines(); WindowMessageResponse::JustRedraw - } else { - //still running - WindowMessageResponse::DoNothing - } + }, } }, WindowMessage::CtrlKeyPress(key_press) => { - if self.state == State::Running && key_press.key == 'c' { + if self.mode == Mode::Running && key_press.key == 'c' { //kills and running_process is now None let _ = self.running_process.take().unwrap().kill(); - self.state = State::Input; + self.mode = Mode::Input; WindowMessageResponse::JustRedraw - } else if self.state == State::Input && (key_press.key == 'p' || key_press.key == 'n') { + } else if self.mode == Mode::Input && (key_press.key == 'p' || key_press.key == 'n') { //only the last command is saved unlike other terminals. good enough for me if key_press.key == 'p' && self.last_command.is_some() { self.current_input = self.last_command.clone().unwrap(); + self.calc_actual_lines(); WindowMessageResponse::JustRedraw } else if key_press.key == 'n' { self.current_input = String::new(); + self.calc_actual_lines(); WindowMessageResponse::JustRedraw } else { WindowMessageResponse::DoNothing @@ -113,6 +197,24 @@ impl WindowLike for Terminal { WindowMessageResponse::DoNothing } }, + WindowMessage::Shortcut(shortcut) => { + match shortcut { + ShortcutType::ClipboardPaste(copy_string) => { + if self.mode == Mode::Input || self.mode == Mode::Stdin { + if self.mode == Mode::Input { + self.current_input += copy_string; + } else { + self.current_stdin_input += copy_string; + } + self.calc_actual_lines(); + WindowMessageResponse::JustRedraw + } else { + WindowMessageResponse::DoNothing + } + }, + _ => WindowMessageResponse::DoNothing, + } + }, _ => WindowMessageResponse::DoNothing, } } @@ -122,7 +224,7 @@ impl WindowLike for Terminal { DrawInstructions::Rect([0, 0], self.dimensions, theme_info.alt_background), ]; //add the visible lines of text - let end_line = self.actual_line_num + self.get_max_lines(); + let end_line = self.actual_line_num + self.get_max_lines() - 1; let mut text_y = PADDING; for line_num in self.actual_line_num..end_line { if line_num == self.actual_lines.len() { @@ -132,6 +234,7 @@ impl WindowLike for Terminal { instructions.push(DrawInstructions::Text([PADDING, text_y], vec!["nimbus-romono".to_string()], line, theme_info.alt_text, theme_info.alt_background, Some(0), Some(MONO_WIDTH))); text_y += LINE_HEIGHT; } + instructions.push(DrawInstructions::Text([PADDING, self.dimensions[1] - LINE_HEIGHT], vec!["nimbus-romono".to_string()], self.mode.to_string(), theme_info.alt_text, theme_info.alt_background, Some(0), Some(MONO_WIDTH))); instructions } @@ -161,37 +264,64 @@ impl Terminal { (self.dimensions[1] - PADDING * 2) / LINE_HEIGHT } - fn process_command(&mut self) -> State { + fn process_command(&mut self) -> Mode { if self.current_input.starts_with("clear ") || self.current_input == "clear" { self.lines = Vec::new(); - State::Input + Mode::Input } else if self.current_input.starts_with("cd ") { let mut cd_split = self.current_input.split(" "); cd_split.next().unwrap(); let arg = cd_split.next().unwrap(); if let Ok(new_path) = concat_paths(&self.current_path, arg) { - if new_path.exists() { + if new_path.is_dir() { self.current_path = new_path.to_str().unwrap().to_string(); } } - State::Input + Mode::Input } else { - self.running_process = Some(Command::new("sh").arg("-c").arg(&self.current_input).current_dir(&self.current_path).stdout(Stdio::piped()).stderr(Stdio::piped()).spawn().unwrap()); - State::Running + let (pty, pts) = blocking::open().unwrap(); + self.running_process = Some(blocking::Command::new("sh").arg("-c").arg(&self.current_input).current_dir(&self.current_path).stdin(Stdio::piped()).spawn(pts).unwrap()); + let (tx1, rx1) = channel(); + thread::spawn(move || { + let reader = BufReader::new(pty); + for line in reader.lines() { + tx1.send(line.unwrap().to_string()).unwrap(); + } + }); + let mut stdin = self.running_process.as_mut().unwrap().stdin.take().unwrap(); + let (tx2, rx2) = channel(); + thread::spawn(move || { + loop { + if let Ok(write_line) = rx2.recv() { + let write_line: String = write_line + "\n"; + stdin.write(write_line.as_bytes()).unwrap(); + } else { + break; + } + } + }); + self.pty_outerr_rx = Some(rx1); + self.pty_in_tx = Some(tx2); + Mode::Running } } fn calc_actual_lines(&mut self) { self.actual_lines = Vec::new(); let max_chars_per_line = (self.dimensions[0] - PADDING * 2) / MONO_WIDTH as usize; - let end = if self.state == State::Input { + let end = if self.mode != Mode::Running { self.lines.len() } else { self.lines.len() - 1 }; for line_num in 0..=end { let mut working_line = if line_num == self.lines.len() { - "$ ".to_string() + &self.current_input + "█" + if self.mode == Mode::Input { + "$ ".to_string() + &self.current_input + "█" + } else { + //Mode::Stdin + self.current_stdin_input.clone() + "█" + } } else { self.lines[line_num].clone() }; diff --git a/src/dirs.rs b/src/dirs.rs new file mode 100644 index 0000000..39234eb --- /dev/null +++ b/src/dirs.rs @@ -0,0 +1,40 @@ +use std::env; +use std::path::PathBuf; + +pub fn home() -> Option { + if let Ok(home) = env::var("HOME") { + Some(PathBuf::from(home)) + } else { + None + } +} + +pub fn data_dir() -> Option { + //$XDG_DATA_HOME or $HOME/.local/share + if let Ok(data_home) = env::var("XDG_DATA_HOME") { + Some(PathBuf::from(data_home)) + } else { + if let Some(mut data_home) = home() { + data_home.push(".local"); + data_home.push("share"); + Some(data_home) + } else { + None + } + } +} + +pub fn config_dir() -> Option { + //$XDG_CONFIG_HOME or $HOME/.config + if let Ok(config_home) = env::var("XDG_CONFIG_HOME") { + Some(PathBuf::from(config_home)) + } else { + if let Some(mut config_home) = home() { + config_home.push(".config"); + Some(config_home) + } else { + None + } + } +} + diff --git a/src/essential/desktop_background.rs b/src/essential/desktop_background.rs index 4b0a862..0096906 100644 --- a/src/essential/desktop_background.rs +++ b/src/essential/desktop_background.rs @@ -3,13 +3,12 @@ use std::vec::Vec; use std::fs::File; use std::io::Read; -use dirs::config_dir; - use crate::window_manager::{ DrawInstructions, WindowLike, WindowLikeType, TASKBAR_HEIGHT, INDICATOR_HEIGHT }; use crate::messages::{ WindowMessage, WindowMessageResponse, ShortcutType }; use crate::framebuffer::Dimensions; use crate::themes::ThemeInfo; use crate::utils::{ hex_to_u8, is_hex }; +use crate::dirs::config_dir; pub struct DesktopBackground { dimensions: Dimensions, diff --git a/src/essential/lock_screen.rs b/src/essential/lock_screen.rs index 5914c99..861a246 100644 --- a/src/essential/lock_screen.rs +++ b/src/essential/lock_screen.rs @@ -56,7 +56,7 @@ impl WindowLike for LockScreen { DrawInstructions::Text([4, 4 + 16], vec!["nimbus-roman".to_string()], "\"Yellow,\" he thought, and stomped off back to his bedroom to get dressed.".to_string(), [255, 255, 255], [0, 0, 0], None, None), DrawInstructions::Text([4, 4 + 16 * 2], vec!["nimbus-roman".to_string()], "He stared at it.".to_string(), [255, 255, 255], [0, 0, 0], None, None), DrawInstructions::Text([4, 4 + 16 * 3], vec!["nimbus-roman".to_string()], "Password: ".to_string(), [255, 255, 255], [0, 0, 0], None, None), - DrawInstructions::Text([85, 4 + 16 * 3], vec!["nimbus-roman".to_string()], "*".repeat(self.input_password.len()), [255, 255, 255], [0, 0, 0], None, None), + DrawInstructions::Text([80, 4 + 16 * 3], vec!["nimbus-roman".to_string()], "*".repeat(self.input_password.len()), [255, 255, 255], [0, 0, 0], None, None), ] } diff --git a/src/essential/start_menu.rs b/src/essential/start_menu.rs index d48b90b..e9b7367 100644 --- a/src/essential/start_menu.rs +++ b/src/essential/start_menu.rs @@ -9,7 +9,7 @@ use crate::themes::ThemeInfo; use crate::components::Component; use crate::components::highlight_button::HighlightButton; -static CATEGORIES: [&'static str; 9] = ["About", "Utils", "Games", "Editing", "Files", "System", "Misc", "Help", "Logout"]; +static CATEGORIES: [&'static str; 9] = ["About", "Utils", "Games", "Editing", "Files", "Internet", "Misc", "Help", "Logout"]; #[derive(Clone)] enum StartMenuMessage { diff --git a/src/essential/taskbar.rs b/src/essential/taskbar.rs index 8b453fd..6168b11 100644 --- a/src/essential/taskbar.rs +++ b/src/essential/taskbar.rs @@ -48,13 +48,12 @@ impl WindowLike for Taskbar { } }, WindowMessage::Info(info) => { - match info { - InfoType::WindowsInWorkspace(windows, focused_id) => { - self.windows_in_workspace = windows; - self.focused_id = focused_id; - WindowMessageResponse::JustRedraw - } - _ => WindowMessageResponse::DoNothing, + if let InfoType::WindowsInWorkspace(windows, focused_id) = info { + self.windows_in_workspace = windows; + self.focused_id = focused_id; + WindowMessageResponse::JustRedraw + } else { + WindowMessageResponse::DoNothing } }, _ => WindowMessageResponse::DoNothing, diff --git a/src/lib.rs b/src/lib.rs index e36798f..48ce957 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,6 +8,7 @@ pub mod utils; pub mod logging; pub mod ipc; pub mod serialize; +pub mod dirs; mod proxy_window_like; mod essential; diff --git a/src/logging.rs b/src/logging.rs index 47efd79..5a1e98a 100644 --- a/src/logging.rs +++ b/src/logging.rs @@ -1,7 +1,7 @@ use std::fs::{ OpenOptions, create_dir }; use std::io::Write; -use dirs::data_dir; +use crate::dirs::data_dir; pub fn log(message: &str) { let data = data_dir().unwrap().into_os_string().into_string().unwrap(); diff --git a/src/messages.rs b/src/messages.rs index 97f1302..f17dd7a 100644 --- a/src/messages.rs +++ b/src/messages.rs @@ -73,6 +73,7 @@ pub enum ShortcutType { QuitWindow, MoveWindow(Direction), MoveWindowToEdge(Direction), + ChangeWindowSize(Direction), CenterWindow, FullscreenWindow, HalfWidthWindow, //half width, full height diff --git a/src/serialize.rs b/src/serialize.rs index 09ff786..d1f901b 100644 --- a/src/serialize.rs +++ b/src/serialize.rs @@ -538,6 +538,12 @@ impl Serializable for WindowMessage { Direction::Up => "Up", Direction::Right => "Right", }), + ShortcutType::ChangeWindowSize(d) => format!("ChangeWindowSize/{}", match d { + Direction::Left => "Left", + Direction::Down => "Down", + Direction::Up => "Up", + Direction::Right => "Right", + }), ShortcutType::CenterWindow => "CenterWindow".to_string(), ShortcutType::FullscreenWindow => "FullscreenWindow".to_string(), ShortcutType::HalfWidthWindow => "HalfWidthWindow".to_string(), @@ -617,7 +623,7 @@ impl Serializable for WindowMessage { "FocusPrevWindow" => Some(ShortcutType::FocusPrevWindow), "FocusNextWindow" => Some(ShortcutType::FocusNextWindow), "QuitWindow" => Some(ShortcutType::QuitWindow), - "MoveWindow" | "MoveWindowToEdge" => { + "MoveWindow" | "MoveWindowToEdge" | "ChangeWindowSize" => { let darg = parts.next(); if let Some(darg) = darg { let direction = match darg { @@ -630,8 +636,10 @@ impl Serializable for WindowMessage { if let Some(direction) = direction { if arg == "MoveWindow" { Some(ShortcutType::MoveWindow(direction)) - } else { + } else if arg == "MoveWindowToEdge" { Some(ShortcutType::MoveWindowToEdge(direction)) + } else { + Some(ShortcutType::ChangeWindowSize(direction)) } } else { None diff --git a/src/window_manager.rs b/src/window_manager.rs index 7bd0a6f..dc60a0c 100644 --- a/src/window_manager.rs +++ b/src/window_manager.rs @@ -8,12 +8,12 @@ use std::fs::File; use std::io::Read; use linux_framebuffer::Framebuffer; -use dirs::config_dir; use crate::framebuffer::{ FramebufferWriter, Point, Dimensions, RGBColor }; use crate::themes::{ ThemeInfo, Themes, get_theme_info }; use crate::utils::{ min, point_inside }; use crate::messages::*; +use crate::dirs::config_dir; use crate::proxy_window_like::ProxyWindowLike; use crate::essential::desktop_background::DesktopBackground; use crate::essential::taskbar::Taskbar; @@ -251,7 +251,7 @@ impl WindowManager { if !self.locked { //keyboard shortcut let shortcuts = HashMap::from([ - //alt+e is terminate program (ctrl+c) + //alt+E kills ming-wm when it is unlocked, but that is handled at a higher level ('s', ShortcutType::StartMenu), ('[', ShortcutType::FocusPrevWindow), (']', ShortcutType::FocusNextWindow), @@ -271,7 +271,12 @@ impl WindowManager { ('J', ShortcutType::MoveWindowToEdge(Direction::Down)), ('K', ShortcutType::MoveWindowToEdge(Direction::Up)), ('L', ShortcutType::MoveWindowToEdge(Direction::Right)), - // + //expand window size + ('n', ShortcutType::ChangeWindowSize(Direction::Right)), + ('m', ShortcutType::ChangeWindowSize(Direction::Down)), + //shrink window size + ('N', ShortcutType::ChangeWindowSize(Direction::Left)), + ('M', ShortcutType::ChangeWindowSize(Direction::Up)), //no 10th workspace ('1', ShortcutType::SwitchWorkspace(0)), ('2', ShortcutType::SwitchWorkspace(1)), @@ -359,6 +364,64 @@ impl WindowManager { } } }, + &ShortcutType::ChangeWindowSize(direction) => { + if let Some(focused_index) = self.get_focused_index() { + let focused_info = &self.window_infos[focused_index]; + if focused_info.window_like.subtype() == WindowLikeType::Window && focused_info.window_like.resizable() && !focused_info.fullscreen { + //mostly arbitrary + let min_window_size = [100, WINDOW_TOP_HEIGHT + 5]; + let mut changed = false; + let delta = 15; + let window = &mut self.window_infos[focused_index]; + if direction == Direction::Right { + //expand x + if window.dimensions[0] + delta != self.dimensions[0] { + window.dimensions[0] += delta; + let max_width = self.dimensions[0] - window.top_left[0]; + if window.dimensions[0] > max_width { + window.dimensions[0] = max_width; + } + changed = true; + } + } else if direction == Direction::Down { + //expand y + let max_height = self.dimensions[1] - window.top_left[1] - INDICATOR_HEIGHT - TASKBAR_HEIGHT; + if window.dimensions[1] + delta != max_height { + window.dimensions[1] += delta; + if window.dimensions[1] > max_height { + window.dimensions[1] = max_height; + } + changed = true; + } + } else if direction == Direction::Left { + //shrink x + if window.dimensions[0] - delta != min_window_size[0] { + window.dimensions[0] -= delta; + if window.dimensions[0] < min_window_size[0] { + window.dimensions[0] = min_window_size[0]; + } + changed = true; + } + } else if direction == Direction::Up { + //shrink y + if window.dimensions[1] - delta != min_window_size[1] { + window.dimensions[1] -= delta; + if window.dimensions[1] < min_window_size[1] { + window.dimensions[1] = min_window_size[1]; + } + changed = true; + } + } + if changed { + let new_dimensions = [window.dimensions[0], window.dimensions[1] - WINDOW_TOP_HEIGHT]; + self.window_infos[focused_index].window_like.handle_message(WindowMessage::ChangeDimensions(new_dimensions)); + press_response = WindowMessageResponse::JustRedraw; + use_saved_buffer = true; + redraw_ids = Some(vec![self.focused_id]); + } + } + } + }, &ShortcutType::SwitchWorkspace(workspace) => { if self.current_workspace != workspace { //close start menu if open @@ -459,8 +522,14 @@ impl WindowManager { let window_like = &self.window_infos[focused_index].window_like; if window_like.subtype() == WindowLikeType::Window && window_like.resizable() { self.window_infos[focused_index].fullscreen = false; + let top_left = &mut self.window_infos[focused_index].top_left; + if top_left[0] > self.dimensions[0] / 2 { + top_left[0] = self.dimensions[0] / 2; + } else { + top_left[0] = 0; + } + top_left[1] = INDICATOR_HEIGHT; //full height, half width - self.window_infos[focused_index].top_left = [0, INDICATOR_HEIGHT]; let new_dimensions = [self.dimensions[0] / 2, self.dimensions[1] - INDICATOR_HEIGHT - TASKBAR_HEIGHT]; self.window_infos[focused_index].dimensions = new_dimensions; self.window_infos[focused_index].window_like.handle_message(WindowMessage::ChangeDimensions([new_dimensions[0], new_dimensions[1] - WINDOW_TOP_HEIGHT]));