Skip to content

Addressed an issue with Japanese language display. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Qsan-jp wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Addressed an issue with Japanese language display. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CJK/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ These fonts have optimized 11px - 16px bitmapped fonts
* odosung-1.4.2.ttc - Open Desktop variant - version 1.4.2: https://pkgs.org/download/opendesktop-fonts
* odosung-1.6.1.ttc - (Unofficial?) Open Desktop variant - version 1.6.1: http://rpmfind.net/linux/RPM/mageia/6/x86_64/media/core/release/fonts-ttf-chinese-opendesktop-1.6.100-7.mga6.noarch.html
* wqy-zenhei-0.8.38.ttc - WenQuanYi Zen Hei font (12px-16px) - version 0.8.38: http://wenq.org/wqy2/index.cgi?ZenHei(en)

* sazanami-mincho.ttf - Sazanami font Mincho - sazanami 20040629: https://ja.osdn.net/projects/efont/
* sazanami-gothic.ttf - Sazanami font Mincho - sazanami 20040629: https://ja.osdn.net/projects/efont/
Binary file added CJK/sazanami-gothic.ttf
View file
Open in desktop
Binary file not shown.
Binary file added CJK/sazanami-mincho.ttf
View file
Open in desktop
Binary file not shown.
183 changes: 176 additions & 7 deletions config/12normal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,187 @@
]
},
{
"file": "CJK/wenquanyi_9pt.bdf",
"file": "CJK/sazanami-gothic.ttf",
"size": 12,
"ranges": [
{"start": "0x3040", "end": "0x30ff", "ignore_ascent": true}
]
},
{
"file": "CJK/sazanami-mincho.ttf",
"size": 12,
"ranges": [
{"start": "0x3040", "end": "0x30ff", "ignore_ascent": true},
{"list": [
//Random characters used in ja translation not included in firefly
"0x5024", "0x52b9", "0x5358", "0x5727", "0x5909",
"0x5b9f", "0x5bfe", "0x623b", "0x629e", "0x62e1",
"0x633f", "0x6442", "0x691c", "0x7d4c", "0x7d76",
"0x7d9a", "0x7dd1", "0x8535", "0x8ee2", "0x9045"
"0x3001", "0x3002", "0x3006", "0x3007", "0x301c",
"0x4e17", "0x4e21", "0x4e55", "0x4e57", "0x4e62",
"0x4e80", "0x4e8a", "0x4e9c", "0x4eb0", "0x4ecf",
"0x4eed", "0x4eee", "0x4f1c", "0x4fa1", "0x4fab",
"0x4fad", "0x4fe4", "0x4fe5", "0x5024", "0x5036",
"0x5039", "0x5050", "0x5056", "0x5078", "0x50cd",
"0x50de", "0x5101", "0x5116", "0x514e", "0x5150",
"0x516a", "0x5186", "0x5190", "0x51a6", "0x51a8",
"0x51a9", "0x51b4", "0x51d6", "0x51e6", "0x51e7",
"0x51e9", "0x51ea", "0x51fe", "0x5204", "0x520b",
"0x5214", "0x5227", "0x524f", "0x5263", "0x5264",
"0x5270", "0x5271", "0x5273", "0x5292", "0x5294",
"0x52b4", "0x52b5", "0x52b9", "0x52c5", "0x52e0",
"0x52e7", "0x52f2", "0x5301", "0x5302", "0x5333",
"0x5346", "0x5358", "0x53a0", "0x53b0", "0x53b3",
"0x53ce", "0x53fa", "0x5449", "0x5451", "0x545f",
"0x546a", "0x54b2", "0x54d8", "0x5516", "0x554c",
"0x5553", "0x555d", "0x559e", "0x55a9", "0x55b0",
"0x55b6", "0x5650", "0x565b", "0x567a", "0x568a",
"0x5694", "0x56a0", "0x56a2", "0x56ce", "0x56d8",
"0x56e3", "0x56f2", "0x56f3", "0x5700", "0x570f",
"0x5726", "0x5727", "0x5737", "0x5738", "0x577f",
"0x5788", "0x5789", "0x57aa", "0x57b0", "0x57b3",
"0x57c0", "0x57d3", "0x57d6", "0x583a", "0x5841",
"0x5869", "0x5870", "0x5872", "0x5897", "0x58b8",
"0x58b9", "0x58ca", "0x58cc", "0x58d7", "0x58dc",
"0x58e5", "0x58f1", "0x58f2", "0x58f7", "0x58fb",
"0x5909", "0x5910", "0x5918", "0x591b", "0x5932",
"0x5968", "0x596c", "0x599b", "0x59ac", "0x59c9",
"0x59d9", "0x59eb", "0x5a1a", "0x5a2f", "0x5ad0",
"0x5b22", "0x5b36", "0x5b8d", "0x5b9f", "0x5bc3",
"0x5bc9", "0x5bdb", "0x5bf3", "0x5bfe", "0x5c02",
"0x5c05", "0x5c13", "0x5c20", "0x5c2d", "0x5c53",
"0x5c76", "0x5cbb", "0x5cbc", "0x5cbe", "0x5cc5",
"0x5ce0", "0x5ce9", "0x5cef", "0x5cfa", "0x5d15",
"0x5d18", "0x5d5c", "0x5d73", "0x5d76", "0x5d8b",
"0x5d8c", "0x5d90", "0x5dcc", "0x5dd3", "0x5de3",
"0x5df5", "0x5dfb", "0x5e0b", "0x5e2f", "0x5e30",
"0x5e47", "0x5e64", "0x5e81", "0x5e83", "0x5ec3",
"0x5ecf", "0x5ed0", "0x5ef0", "0x5ef8", "0x5efb",
"0x5efc", "0x5f09", "0x5f0c", "0x5f0d", "0x5f10",
"0x5f16", "0x5f3e", "0x5f41", "0x5f51", "0x5f5c",
"0x5f83", "0x5f93", "0x5fb3", "0x5fb4", "0x5fdc",
"0x5ff0", "0x6031", "0x603a", "0x604a", "0x6060",
"0x6075", "0x6077", "0x608b", "0x60a7", "0x60a9",
"0x60aa", "0x60b3", "0x60e3", "0x6121", "0x613c",
"0x613d", "0x6142", "0x6159", "0x616f", "0x6187",
"0x6199", "0x61d0", "0x61f4", "0x621d", "0x621e",
"0x6226", "0x622f", "0x6238", "0x623b", "0x6255",
"0x6268", "0x6282", "0x629c", "0x629e", "0x62dd",
"0x62e0", "0x62e1", "0x6319", "0x6327", "0x633f",
"0x635c", "0x63b2", "0x63b5", "0x63bb", "0x63fa",
"0x6442", "0x6483", "0x64b9", "0x64e1", "0x64e7",
"0x64f6", "0x6505", "0x654d", "0x6588", "0x6589",
"0x658e", "0x65d9", "0x663f", "0x6644", "0x6667",
"0x6669", "0x6681", "0x6683", "0x668e", "0x66a6",
"0x66bc", "0x66c1", "0x66f5", "0x66fd", "0x6716",
"0x671e", "0x6736", "0x6737", "0x6741", "0x6762",
"0x6763", "0x6764", "0x67a0", "0x67a1", "0x67a6",
"0x67a9", "0x67fb", "0x67fe", "0x6802", "0x6803",
"0x6804", "0x681e", "0x6822", "0x6859", "0x685c",
"0x685d", "0x685f", "0x688d", "0x68b6", "0x68b9",
"0x68ba", "0x68bc", "0x68ca", "0x6900", "0x6919",
"0x691a", "0x691b", "0x691c", "0x6921", "0x6922",
"0x6923", "0x6926", "0x6928", "0x6936", "0x6955",
"0x6961", "0x6973", "0x697d", "0x697e", "0x6981",
"0x698a", "0x69b2", "0x69c7", "0x69d8", "0x69dd",
"0x69de", "0x69f9", "0x6a0b", "0x6a0c", "0x6a12",
"0x6a22", "0x6a29", "0x6a2b", "0x6a2e", "0x6a36",
"0x6a72", "0x6a78", "0x6aaa", "0x6ac1", "0x6b05",
"0x6b1d", "0x6b1f", "0x6b53", "0x6b69", "0x6b6f",
"0x6b73", "0x6b74", "0x6bb1", "0x6bbb", "0x6bce",
"0x6bdf", "0x6c17", "0x6c37", "0x6c5a", "0x6c62",
"0x6ca2", "0x6d44", "0x6d99", "0x6d9c", "0x6e07",
"0x6e08", "0x6e09", "0x6e0b", "0x6e13", "0x6e15",
"0x6e76", "0x6e80", "0x6e82", "0x6e8c", "0x6edd",
"0x6f11", "0x6f45", "0x6f81", "0x6f91", "0x6ff3",
"0x6ff6", "0x701e", "0x702c", "0x70f1", "0x7114",
"0x713c", "0x7155", "0x7188", "0x7195", "0x71d7",
"0x71f5", "0x723c", "0x7240", "0x7282", "0x7287",
"0x72a0", "0x72b2", "0x72db", "0x72e2", "0x731f",
"0x732f", "0x734f", "0x7363", "0x73ce", "0x73f1",
"0x7460", "0x74a2", "0x74f0", "0x74f1", "0x74f2",
"0x74f8", "0x7505", "0x750e", "0x751e", "0x753c",
"0x7544", "0x7546", "0x7549", "0x754a", "0x754d",
"0x7551", "0x7560", "0x7567", "0x7569", "0x756d",
"0x7573", "0x7582", "0x7589", "0x758e", "0x75e9",
"0x763b", "0x7667", "0x7668", "0x767a", "0x7680",
"0x7683", "0x7690", "0x76b7", "0x76b9", "0x770c",
"0x771e", "0x7724", "0x7815", "0x783f", "0x7872",
"0x7874", "0x78af", "0x78b5", "0x78c6", "0x7907",
"0x799d", "0x79e1", "0x7a32", "0x7a3e", "0x7a42",
"0x7a43", "0x7a49", "0x7a4f", "0x7a50", "0x7a63",
"0x7a7d", "0x7a93", "0x7ab0", "0x7ac3", "0x7ac8",
"0x7acd", "0x7acf", "0x7ad2", "0x7ad3", "0x7ad5",
"0x7ada", "0x7adc", "0x7add", "0x7ae1", "0x7ae2",
"0x7aea", "0x7af0", "0x7af8", "0x7b02", "0x7b36",
"0x7b39", "0x7b6c", "0x7b7a", "0x7b86", "0x7b92",
"0x7b9a", "0x7b9f", "0x7bcf", "0x7bed", "0x7bf6",
"0x7c12", "0x7c13", "0x7c14", "0x7c17", "0x7c4f",
"0x7c56", "0x7c58", "0x7c7e", "0x7c82", "0x7c83",
"0x7c8b", "0x7c90", "0x7c9b", "0x7cab", "0x7cad",
"0x7cc0", "0x7cc2", "0x7cd8", "0x7cfa", "0x7d4b",
"0x7d4c", "0x7d75", "0x7d76", "0x7d89", "0x7d99",
"0x7d9a", "0x7d9b", "0x7dab", "0x7dcf", "0x7dd1",
"0x7dd5", "0x7ddc", "0x7de4", "0x7e01", "0x7e04",
"0x7e05", "0x7e26", "0x7e4a", "0x7e4b", "0x7e4d",
"0x7e5d", "0x7e66", "0x7e67", "0x7e7f", "0x7e83",
"0x7e89", "0x7e8e", "0x7e90", "0x7e92", "0x7f4e",
"0x7f78", "0x7f82", "0x7fa3", "0x7fae", "0x7fc6",
"0x805f", "0x8061", "0x8062", "0x8068", "0x8074",
"0x80ac", "0x8107", "0x8133", "0x815f", "0x8193",
"0x81a4", "0x81b8", "0x81c8", "0x81d3", "0x820e",
"0x8217", "0x8218", "0x8229", "0x822e", "0x825d",
"0x8262", "0x826a", "0x8276", "0x82c5", "0x8318",
"0x8323", "0x8358", "0x839f", "0x83b5", "0x83d3",
"0x83f7", "0x8420", "0x8422", "0x842a", "0x8462",
"0x8484", "0x84ad", "0x84d9", "0x84da", "0x8535",
"0x854b", "0x855a", "0x8597", "0x85ab", "0x85ac",
"0x8602", "0x8613", "0x862f", "0x8630", "0x86ab",
"0x86cd", "0x86ef", "0x874b", "0x877f", "0x87c7",
"0x87d0", "0x880e", "0x880f", "0x8827", "0x8842",
"0x8846", "0x885e", "0x88ae", "0x88b0", "0x88b4",
"0x88b5", "0x88bf", "0x88c3", "0x88c4", "0x8904",
"0x891d", "0x8943", "0x894d", "0x8977", "0x8987",
"0x898a", "0x899a", "0x89a7", "0x89a9", "0x89b3",
"0x89e7", "0x8a33", "0x8aac", "0x8aad", "0x8acc",
"0x8ada", "0x8b0c", "0x8b21", "0x8b4c", "0x8b5b",
"0x8b71", "0x8b72", "0x8b83", "0x8b90", "0x8c3a",
"0x8c7c", "0x8c8e", "0x8cad", "0x8cae", "0x8ccd",
"0x8cce", "0x8cdb", "0x8d0b", "0x8d71", "0x8e08",
"0x8e99", "0x8eb0", "0x8eb1", "0x8ebe", "0x8ec5",
"0x8ec6", "0x8ec8", "0x8ee2", "0x8ee3", "0x8efd",
"0x8f0c", "0x8f19", "0x8f4c", "0x8f5c", "0x8fa7",
"0x8fb7", "0x8fba", "0x8fbb", "0x8fbc", "0x8fda",
"0x8fef", "0x900e", "0x9013", "0x9027", "0x9039",
"0x9045", "0x9056", "0x9061", "0x9089", "0x90a8",
"0x90f7", "0x9154", "0x9197", "0x91a4", "0x91b8",
"0x91c8", "0x91d6", "0x91db", "0x91df", "0x91e1",
"0x91f6", "0x91fc", "0x920e", "0x9229", "0x922c",
"0x9244", "0x9262", "0x9271", "0x92ad", "0x92ed",
"0x92f2", "0x92f3", "0x932c", "0x9332", "0x933a",
"0x933b", "0x9344", "0x936e", "0x93ad", "0x93b9",
"0x93e5", "0x941a", "0x9421", "0x9441", "0x9453",
"0x945a", "0x945b", "0x9587", "0x958a", "0x9596",
"0x9599", "0x95a0", "0x95a2", "0x95a7", "0x95b2",
"0x95d8", "0x9665", "0x9666", "0x967a", "0x96a0",
"0x96b2", "0x96b7", "0x96d1", "0x96eb", "0x970a",
"0x9764", "0x976b", "0x976d", "0x9771", "0x9779",
"0x9786", "0x9790", "0x97c8", "0x97ee", "0x97f2",
"0x981a", "0x982c", "0x9834", "0x983c", "0x983d",
"0x984b", "0x9854", "0x9855", "0x98aa", "0x98c3",
"0x98dc", "0x98ee", "0x991d", "0x9920", "0x9942",
"0x99bc", "0x99c4", "0x99c5", "0x99c6", "0x99c8",
"0x99f2", "0x9a12", "0x9a13", "0x9a28", "0x9ac4",
"0x9ade", "0x9ae2", "0x9aea", "0x9af4", "0x9b2a",
"0x9b83", "0x9b8e", "0x9b96", "0x9b97", "0x9b9f",
"0x9bb4", "0x9bcf", "0x9bd1", "0x9bd2", "0x9be3",
"0x9bf1", "0x9bf2", "0x9bf5", "0x9c04", "0x9c0a",
"0x9c0c", "0x9c10", "0x9c15", "0x9c1b", "0x9c2e",
"0x9c2f", "0x9c30", "0x9c3a", "0x9c47", "0x9c5a",
"0x9c76", "0x9ceb", "0x9cec", "0x9cf0", "0x9d0e",
"0x9d2a", "0x9d2b", "0x9d2c", "0x9d44", "0x9d46",
"0x9d48", "0x9d50", "0x9d5e", "0x9d64", "0x9d7a",
"0x9d8f", "0x9dab", "0x9dc4", "0x9dc6", "0x9e78",
"0x9e81", "0x9e95", "0x9eaa", "0x9eb9", "0x9eba",
"0x9ebf", "0x9ed2", "0x9ed9", "0x9f08", "0x9f21",
"0x9f62", "0x9f9d"
], "ignore_ascent": true}

]
},
{
Expand Down
Loading