Skip to content

support Japanese Kana #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
Luci6fuge wants to merge 2 commits into
base: master
Choose a base branch
from
Open

support Japanese Kana #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13837c2
support Japanese Kana
Luci6fuge Jun 5, 2022
d07d186
Merge branch 'dj1yfk:master' into kana_support
Luci6fuge Jun 9, 2022
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
29 changes: 27 additions & 2 deletions codetables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,5 +548,30 @@ const static char *utf8table[] = {
};




// table for Japanese Kana
const static char *kanaTable[] = {
NULL, "--.--", "--.--", ".-", ".-", "..-", "..-", "-.---",
"-.---", ".-...", ".-...", ".-..", ".-.. ..", "-.-..", "-.-.. ..", "...-",
"...- ..", "-.--", "-.-- ..", "----", "---- ..", "-.-.-", "-.-.- ..", "--.-.",
"--.-. ..", "---.-", "---.- ..", ".---.", ".---. ..", "---.", "---. ..", "-.",
"-. ..", "..-.", "..-. ..", ".--.", ".--.", ".--. ..", ".-.--", ".-.-- ..",
"..-..", "..-.. ..", ".-.", "-.-.", "....", "--.-", "..--", "-...",
"-... ..", "-... ..--.", "--..-", "--..- ..", "--..- ..--.", "--..", "--.. ..", "--.. ..--.",
".", ". ..", ". ..--.", "-..", "-.. ..", "-.. ..--.", "-..-", "..-.-",
"-", "-...-", "-..-.", ".--", ".--", "-..--", "-..--", "--",
"--", "...", "--.", "-.--.", "---", ".-.-", "-.-", "-.-",
".-..-", ".--..", ".---", ".-.-.", "..- ..", ".-..", "-.--", NULL,
NULL, "..", "..--.", "..", "..--.", NULL, NULL, NULL,
NULL, "--.--", "--.--", ".-", ".-", "..-", "..-", "-.---",
"-.---", ".-...", ".-...", ".-..", ".-.. ..", "-.-..", "-.-.. ..", "...-",
"...- ..", "-.--", "-.-- ..", "----", "---- ..", "-.-.-", "-.-.- ..", "--.-.",
"--.-. ..", "---.-", "---.- ..", ".---.", ".---. ..", "---.", "---. ..", "-.",
"-. ..", "..-.", "..-. ..", ".--.", ".--.", ".--. ..", ".-.--", ".-.-- ..",
"..-..", "..-.. ..", ".-.", "-.-.", "....", "--.-", "..--", "-...",
"-... ..", "-... ..--.", "--..-", "--..- ..", "--..- ..--.", "--..", "--.. ..", "--.. ..--.",
".", ". ..", ". ..--.", "-..", "-.. ..", "-.. ..--.", "-..-", "..-.-",
"-", "-...-", "-..-.", ".--", ".--", "-..--", "-..--", "--",
"--", "...", "--.", "-.--.", "---", ".-.-", "-.-", "-.-",
".-..-", ".--..", ".---", ".-.-.", "..- ..", ".-..", "-.--", "-.- ..",
".-..- ..", ".--.. ..", ".--- ..", NULL, ".--.-", NULL, NULL, NULL,
};
67 changes: 47 additions & 20 deletions ebook2cw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,43 @@ void init_cw (CWP *cw) {
}



/* returns number of utf8 octets consumed */
typedef unsigned long ucs4;
int utf8_to_ucs4(const unsigned char *s, ucs4 *ret)
{
int iA;
ucs4 c1 = *s;
if(!(c1 & 0x80)) {
*ret = c1; return 1;
}
c1 ^= 0x80;
unsigned char bit = 0x40;
for(iA=0; iA<5; iA++, bit>>=1) {
if(!(c1 & bit)) break;
if((s[iA+1]&0xc0) != 0x80) return 0;
c1 ^= bit;
}
if(iA == 0) return 0;
int num = iA;
for(iA=0; iA<num; iA++) {
ucs4 d = s[iA+1];
c1 <<= 6;
c1 |= d & 0x3f;
}
*ret = c1;
return num+1;
}
ucs4 getNextChar(const unsigned char *s, int *idx, int encoding)
{
if(encoding != UTF8)
return s[(*idx)++];
ucs4 ret;
int len = utf8_to_ucs4(&s[*idx], &ret);
if(len == 0) // invalid utf-8 character
return s[(*idx)++];
*idx += len;
return ret;
}


/* makeword -- converts 'text' to CW by concatenating dit_buf amd dah_bufs,
Expand All @@ -754,12 +790,11 @@ int makeword(char * text, CWP *cw) {

int c, i, j, u, w;
int prosign = 0;
unsigned char last=0; /* for utf8 2-byte characters */

j = 0; /* position in 'inpcm' buffer */

for (i = 0; i < strlen(text); i++) {
c = (unsigned char) text[i];
for (i = 0; i < strlen(text);) {
c = getNextChar((unsigned char*)text, &i, cw->encoding);
code = NULL;
cw->linepos++;

Expand All @@ -784,28 +819,20 @@ int makeword(char * text, CWP *cw) {
code = ""; /* only inserts letter space */
}
else if (cw->encoding == ISO8859) {
code = iso8859[c];
if(c < sizeof(iso8859)/sizeof(iso8859[0])) {
code = iso8859[c];
}
}
else if (cw->encoding == UTF8) {
/* Character may be 1-byte ASCII or 2-byte UTF8 */
if (!(c & 128)) { /* MSB = 0 -> 7bit ASCII */
if(c < sizeof(iso8859)/sizeof(iso8859[0])) {

@Luci6fuge Luci6fuge Jun 6, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, this line is wrong. It might be

if(c < 128) {

code = iso8859[c]; /* subset of iso8859 */
}
else {
if (last && (c < 192) ) { /* this is the 2nd byte */
/* 110yyyyy 10zzzzzz -> 00000yyy yyzzzzzz */
c = ((last & 31) << 6) | (c & 63);
code = utf8table[c];
last = 0;
}
else { /* this is the first byte */
last = c;
}
} else if(c < sizeof(utf8table)/sizeof(utf8table[0])) {
code = utf8table[c];
} else if(c>=0x3040 && c<=0x30ff) { // Japanese Kana
code = kanaTable[c-0x3040];
}
}

if (last) continue; /* first of two-byte character read */

/* Not found anything, produce warning message */
if (code == NULL) {
#ifndef CGI
Expand Down