dj1yfk
/
ebook2cw
1
0
Fork 0
Code Issues 2 Pull Requests Releases 2 Activity

Improve warning message for unkn. characters, update changelog

This commit is contained in:
Fabian Kurz 2015-01-28 20:24:47 +00:00
parent 4e7b17b36f
commit 2a0280ab19
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,8 +1,12 @@
0.8.3 / 2013-03-03 Fabian Kurz <fabian@fkurz.net>
0.8.3 / 2015- - Fabian Kurz <fabian@fkurz.net>
* Added lowercase Greek alphabet
* Added multiple language support by GNU gettext.
* Added text command |Sx will add x (1 < x < 10000) milliseconds
of silence to the output file
* Comments can now be used in the CW input file; anything after
a hash sign (#) will be treated as such (suggested by DM3DA)
* Warning message for unknown characters improved (tells line
number and character position; suggested by DL2KI)
0.8.2 / 2013-01-04 Fabian Kurz <fabian@fkurz.net>
* Time of conversion and speed-up calculations

29
ebook2cw.c
View File

@ -156,6 +156,10 @@ typedef struct {
be translated to CW), 0 = off, 1 = on,
2 = off after next word */
/* Line of input file; position (byte) within the line */
int linecount;
int linepos;
char configfile[2048];
char id3_author[80],
@ -212,7 +216,7 @@ int main (int argc, char** argv) {
int pos, i, c, tmp;
char word[1024]=""; /* will be cut when > 1024 chars long */
int chapter = 0;
int chw = 0, tw = 0, qw = 0; /* chapter words, total words, qrq words */
int chw = 0, tw = 0; /* chapter words, total words */
int chms = 0, tms = 0, qms = 0; /* millisec: chapter, total, since qrq */
time_t start_time, end_time; /* conversion time */
int finishchapter = 0; /* finish chapter after this sentence */
@ -445,7 +449,6 @@ int main (int argc, char** argv) {
if (cw.qrq && cw.reset) {
cw.wpm = cw.original_wpm;
init_cw(&cw);
qw = 0;
}
finishchapter = 0;
@ -688,6 +691,7 @@ int makeword(char * text, CWP *cw) {
for (i = 0; i < strlen(text); i++) {
c = (unsigned char) text[i];
code = NULL;
cw->linepos++;
if (c == '\n') { /* Same for UTF8 and ISO8859 */
if (cw->comment == 0 && strlen(text) == 1 && cw->pBT) /* paragraph */
@ -698,6 +702,8 @@ int makeword(char * text, CWP *cw) {
else { /* Space instead of newline */
code = " ";
}
cw->linepos = 0;
cw->linecount++;
}
else if (c == '<') { /* prosign on */
prosign = 1;
@ -734,16 +740,17 @@ int makeword(char * text, CWP *cw) {
if (code == NULL) {
#ifndef CGI
if (c < 128) {
fprintf(stderr, _("Warning: Don't know CW for '%c'.\n"), c);
fprintf(stderr, _("Warning: Don't know CW for '%c'. "), c);
}
else if (cw->encoding == ISO8859) {
fprintf(stderr, _("Warning: Don't know CW for '%c' (0x%01X) (try the -u switch to enable UTF-8).\n"), c, c);
fprintf(stderr, _("Warning: Don't know CW for '%c' (0x%01X) (try the -u switch to enable UTF-8). "), c, c);
}
else {
/* TODO: Consider using libunistring's unicode_character_name()
* function to provide the name of the character */
fprintf(stderr, _("Warning: Don't know CW for unicode code point U+%04X\n"), c);
fprintf(stderr, _("Warning: Don't know CW for unicode code point U+%04X. "), c);
}
fprintf(stderr, "[Line %d, Byte %d]\n", cw->linecount, cw->linepos);
#endif
code = " ";
@ -980,7 +987,8 @@ void buf_check (int j, CWP *cw) {
cw->inpcm_size *= 2;
cw->noisebuf_size = cw->inpcm_size;
cw->mp3buffer_size *= 2;
if ((cw->inpcm = realloc(cw->inpcm, cw->inpcm_size*sizeof(short int)))== NULL) {
if ((cw->inpcm = realloc(cw->inpcm, cw->inpcm_size*sizeof(short int))) == NULL) {
fprintf(stderr, "Error: Can't realloc inpcm[%d]\n", cw->inpcm_size);
exit(EXIT_FAILURE);
}
@ -991,10 +999,8 @@ void buf_check (int j, CWP *cw) {
}
fillnoisebuffer(cw->noisebuf, cw->noisebuf_size, NOISEAMPLITUDE);
if ((cw->mp3buffer = realloc(cw->mp3buffer, cw->mp3buffer_size*sizeof(char)))
== NULL) {
fprintf(stderr, "Error: Can't realloc mp3buffer[%d]\n",
cw->mp3buffer_size);
if ((cw->mp3buffer = realloc(cw->mp3buffer, cw->mp3buffer_size*sizeof(char))) == NULL) {
fprintf(stderr, "Error: Can't realloc mp3buffer[%d]\n", cw->mp3buffer_size);
exit(EXIT_FAILURE);
}
}
@ -1999,6 +2005,9 @@ void init_cwp (CWP *cw) {
cw->comment = 0;
cw->linecount = 1;
cw->linepos = 0;
strcpy(cw->configfile, "ebook2cw.conf");
strcpy(cw->id3_author, _("CW audio book"));