Spaceraven/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Add special symbol "parsing"

Browse Source 
git-svn-id: svn://kolibrios.org@6375 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
guillem 2016-03-25 15:39:48 +00:00
parent 955ed8254c
commit 01bcd9bc95
2 changed files with 147 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
programs/cmm/aelia/prepare_page.h
View File

@ -14,7 +14,9 @@ void PreparePage()
} else { } else {
debugln("<html> tag found"); debugln("<html> tag found");
DrawProgress(STEP_2_COUNT_PAGE_HEIGHT); ParceHtml(false); //get page height to calculate buffer size DrawProgress(STEP_2_COUNT_PAGE_HEIGHT); ParceHtml(false); //get page height to calculate buffer size
// debugln("DONE STEP 2");
DrawProgress(STEP_3_DRAW_PAGE_INTO_BUFFER); ParceHtml(true); //draw text in buffer DrawProgress(STEP_3_DRAW_PAGE_INTO_BUFFER); ParceHtml(true); //draw text in buffer
// debugln("DONE STEP 3");
} }
strcat(#title, " - Aelia"); strcat(#title, " - Aelia");
DrawTitle(#title); DrawTitle(#title);
@ -73,8 +75,8 @@ int stroka_y=5, line_length=0;
void ParceHtml(byte draw) void ParceHtml(byte draw)
{ {
dword DOM_start, DOM_end, DOM_len, DOM_pos; dword DOM_start, DOM_end, DOM_len, DOM_pos, aux2;
int stroka_x = HTML_PADDING_X; int stroka_x = HTML_PADDING_X;
int stroka_y = HTML_PADDING_Y; int stroka_y = HTML_PADDING_Y;
int size_pt_change = 0; int size_pt_change = 0;
@ -82,7 +84,7 @@ dword line_break;
byte ch, zeroch; byte ch, zeroch;
_text text; _text text;
_tag tag; _tag tag;
debugln("-------START PARCING-------");
tag.clear(); tag.clear();
style.clear(); style.clear();
/* Create DOM */ /* Create DOM */
@ -108,6 +110,9 @@ _tag tag;
continue; continue;
} }
strtrim(text.start); strtrim(text.start);
// try to change the special symbols that may appear
text.fixSpecial();
while (get_label_len(text.start) + stroka_x + 30 > list.w) while (get_label_len(text.start) + stroka_x + 30 > list.w)
{ {
zeroch = 0; zeroch = 0;
@ -192,4 +197,5 @@ _tag tag;
label.raw_size = 0; label.raw_size = 0;
} }
free(DOM_start); free(DOM_start);
debugln("-------STOP PARCING--------");
} }

139
programs/cmm/aelia/tag.h
View File

@ -101,5 +101,142 @@ void _style::clear()
struct _text { struct _text {
dword start; dword start;
char str[7];
int x, y; int x, y;
}; void fixSpecial();
};
// function to be called to fix the special symbols
void _text::fixSpecial() {
get_char(start);
clean_str();
}
// function that traverse the text in sarch for a special
// character starting with &
// if found, try to look for the conversion
void get_char(dword text) {
byte ch;
int i = 0, j = 0;
dword text2 = text;
loop () {
ch = ESBYTE[text];
if (!ch) return;
if (ch=='&') {
i = 0;
text++;
while ( i < 7) {
ch = ESBYTE[text];
if (ch == ';') {
ESBYTE[text2] = get_symbol();
while (j < i) {
j++;
text2++;
ESBYTE[text2] = 0;
}
//debugln(#str);
break;
}
str[i] = ch;
if (!ch) return;
text++;
i++;
}
}
text++;
text2++;
}
}
// unicode conversion for special characters
char *unicode_tags[]={
"nbsp", " ",
"#38", " ",
"#160", " ",
"ntilde", "ñ", // spanish n special ñ
"#224", 0xC3A0,
"#241", 0xC3B1, // spanish a with grove accent 'à'
"copy", "(c)",
"#169", "(c)",
"trade", "[TM]",
"reg", "(r)",
"#174", "(r)",
"bdquo", ",,",
"amp", "&",
"#38", "&",
"lt", "<",
"#60", "<",
"gt", ">",
"#62", ">",
"minus", "-",
"ndash", "-",
"mdash", "-", //--
"#8722", "-",
"#8211", "-",
"#151", "-",
"#149", "-",
"rsquo", "'",
"#39", "'",
"#96", "'",
"#8217", "'",
"quot", "\"",
"#34", "\"",
"ldquo", "\"",
"rdquo", "\"",
"#8222", "\"",
"#8221", "\"",
"laquo", "<<",
"#171", "<<",
"raquo", ">>",
"#187", ">>",
"uarr", "\24",
"darr", "\25",
"rarr", "\26",
"larr", "\27",
"#1028", "\242",
"#1030", "I",
"#1031", "\244",
"#8470", "N",
"bull", "-", //âîîáùå çäåñü òî÷êà
"percnt","%",
0};
// function to look for the conversion od special characters
// if not found--> return 0
char get_symbol() {
int i;
debugln(#str);
for (i=0; unicode_tags[i]!=0; i+=2) {}
if (strcmp(#str, unicode_tags[i]) == 0) {
//debugval("i: ", i);
return unicode_tags[i+1]);
}
}
return 0;
}
// function to clean string str
void clean_str() {
int i;
for (i=0; i < 7; i++) {
str[i] = 0;
}
}