m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

utf8 is mandatory for HTML5 so convert to utf8

Browse Source
This commit is contained in:
Thomas Bernard 2020-12-22 23:19:16 +01:00
parent 6f21c7e753
commit 101438381d
No known key found for this signature in database
GPG Key ID: DB511043A31ACAAF
1 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/generatedoc.c
View File

@ -51,6 +51,9 @@ const char * const skins[] = {
/// Export the help to HTML files /// Export the help to HTML files
static int Export_help(const char * path); static int Export_help(const char * path);
/// Convert from latin1 to utf-8
static int fputs_utf8(const char * str, size_t len, FILE * f);
int main(int argc,char * argv[]) int main(int argc,char * argv[])
{ {
int r; int r;
@ -193,7 +196,7 @@ static const char * Export_help_table(FILE * f, unsigned int page)
fprintf(f, "<html lang=\"en\">\n"); fprintf(f, "<html lang=\"en\">\n");
fprintf(f, "<head>\n"); fprintf(f, "<head>\n");
fprintf(f, "<title>%s</title>\n", title); fprintf(f, "<title>%s</title>\n", title);
fprintf(f, "<meta charset=\"ISO-8859-1\">\n"); fprintf(f, "<meta charset=\"utf-8\">\n");
fprintf(f, "<link rel=\"stylesheet\" href=\"grafx2.css\" />\n"); fprintf(f, "<link rel=\"stylesheet\" href=\"grafx2.css\" />\n");
fprintf(f, "<script type=\"text/javascript\" src=\"grafx2.js\"></script>\n"); fprintf(f, "<script type=\"text/javascript\" src=\"grafx2.js\"></script>\n");
fprintf(f, "</head>\n"); fprintf(f, "</head>\n");
@ -253,9 +256,10 @@ static const char * Export_help_table(FILE * f, unsigned int page)
if (link_end == NULL) if (link_end == NULL)
link_end = link + strlen(link); link_end = link + strlen(link);
} }
fprintf(f, "%.*s", (int)(link - table[index].Text), table[index].Text); fputs_utf8(table[index].Text, (size_t)(link - table[index].Text), f);
fprintf(f, "<a href=\"%s%.*s\">%.*s</a>%s", prefix, fprintf(f, "<a href=\"%s%.*s\">%.*s</a>", prefix,
(int)(link_end - link), link, (int)(link_end - link), link, link_end); (int)(link_end - link), link, (int)(link_end - link), link);
fputs_utf8(link_end, (size_t)-1, f);
} }
else else
{ {
@ -263,16 +267,19 @@ static const char * Export_help_table(FILE * f, unsigned int page)
const char * text = table[index].Text; const char * text = table[index].Text;
while (text[0] != '\0') while (text[0] != '\0')
{ {
size_t i = strcspn(text, "<>"); size_t i = strcspn(text, "<>&");
if (text[i] == '\0') if (text[i] == '\0')
{ // no character to escape { // no character to escape
fprintf(f, "%s", text); fputs_utf8(text, (size_t)-1, f);
break; break;
} }
if (i > 0) if (i > 0)
fprintf(f, "%.*s", (int)i, text); fputs_utf8(text, (size_t)i, f);
switch(text[i]) switch(text[i])
{ {
case '&':
fprintf(f, "&amp;");
break;
case '<': case '<':
fprintf(f, "&lt;"); fprintf(f, "&lt;");
break; break;
@ -343,7 +350,7 @@ static int Export_help(const char * path)
fprintf(findex, "<html lang=\"en\">\n"); fprintf(findex, "<html lang=\"en\">\n");
fprintf(findex, "<head>\n"); fprintf(findex, "<head>\n");
fprintf(findex, "<title>GrafX2 Help</title>\n"); fprintf(findex, "<title>GrafX2 Help</title>\n");
fprintf(findex, "<meta charset=\"ISO-8859-1\">\n"); fprintf(findex, "<meta charset=\"utf-8\">\n");
fprintf(findex, "<link rel=\"stylesheet\" href=\"grafx2.css\" />\n"); fprintf(findex, "<link rel=\"stylesheet\" href=\"grafx2.css\" />\n");
fprintf(findex, "<noscript>\n"); /* hide the skin selector when JS is disabled */ fprintf(findex, "<noscript>\n"); /* hide the skin selector when JS is disabled */
fprintf(findex, " <style>.skinselector { display: none; }</style>\n"); fprintf(findex, " <style>.skinselector { display: none; }</style>\n");
@ -478,3 +485,25 @@ static int Export_help(const char * path)
free(filename); free(filename);
return 0; return 0;
} }
static int fputs_utf8(const char * str, size_t len, FILE * f)
{
size_t index;
for(index = 0; index < len && str[index] != '\0'; index++)
{
if (str[index] & 0x80)
{
if (putc(0xc0 | ((str[index] >> 6) & 0x03), f) == EOF)
return EOF;
if (putc(0x80 | (str[index] & 0x3f), f) == EOF)
return EOF;
}
else
{
if (putc(str[index], f) == EOF)
return EOF;
}
}
return 0;
}