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

Fix -...- after comments; update Changelog

This commit is contained in:
Fabian Kurz 2013-06-01 09:26:30 +00:00
parent 67a165f1d6
commit 4e7b17b36f
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
0.8.3 / 2013-03-03 Fabian Kurz <fabian@fkurz.net>
* Added lowercase Greek alphabet
* Added multiple language support by GNU gettext.
* Comments can now be used in the CW input file; anything after
a hash sign (#) will be treated as such (suggested by DM3DA)
0.8.2 / 2013-01-04 Fabian Kurz <fabian@fkurz.net>
* Time of conversion and speed-up calculations

39
ebook2cw.c
View File

@ -152,6 +152,10 @@ typedef struct {
char isomap[256][4]; /* by these strings */
char utf8map[256][8];
int comment; /* status for comments (which will not
be translated to CW), 0 = off, 1 = on,
2 = off after next word */
char configfile[2048];
char id3_author[80],
@ -208,7 +212,6 @@ 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 comment = 0; /* status for comment lines (ignored) */
int chw = 0, tw = 0, qw = 0; /* chapter words, total words, qrq words */
int chms = 0, tms = 0, qms = 0; /* millisec: chapter, total, since qrq */
time_t start_time, end_time; /* conversion time */
@ -411,24 +414,18 @@ int main (int argc, char** argv) {
#endif
if (c == '#')
comment = 1;
cw.comment = 1;
if (comment) {
if (c == '\n') {
comment = 0;
}
else {
comment++;
continue;
}
if (cw.comment) {
if (c == '\n') {
cw.comment = 2;
}
else {
continue;
}
}
word[pos++] = c;
if ((c == ' ') || (c == '\n') || (pos == 1024)) {
word[pos] = '\0';
@ -466,6 +463,8 @@ int main (int argc, char** argv) {
chms += tmp;
qms += tmp;
chw++;
if (cw.comment == 2)
cw.comment = 0;
}
/* Every 'cw.qrq' minutes speed up 1 WpM */
@ -691,10 +690,14 @@ int makeword(char * text, CWP *cw) {
code = NULL;
if (c == '\n') { /* Same for UTF8 and ISO8859 */
if ((strlen(text) == 1) && cw->pBT) /* paragraph */
if (cw->comment == 0 && strlen(text) == 1 && cw->pBT) /* paragraph */
code = " -...- ";
else
else if (cw->comment) { /* No spaces after comment line */
code = " ";
}
else { /* Space instead of newline */
code = " ";
}
}
else if (c == '<') { /* prosign on */
prosign = 1;
@ -1994,6 +1997,8 @@ void init_cwp (CWP *cw) {
cw->encoding = ISO8859;
cw->use_isomapping = cw->use_utf8mapping = 0;
cw->comment = 0;
strcpy(cw->configfile, "ebook2cw.conf");
strcpy(cw->id3_author, _("CW audio book"));