Rev 3058 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3058 | Rev 3059 | ||
|---|---|---|---|
| Line 375... | Line 375... | ||
| 375 | for (j=0; j |
375 | for (j=0; j |
| 376 | break; |
376 | break; |
| 377 | } |
377 | } |
| 378 | case 0x0d: |
378 | case 0x0d: |
| 379 | debug("0x0d"); |
379 | bukva = ' '; |
| 380 | bukva = ' '; |
- | |
| 381 | goto DEFAULT_MARK; |
380 | goto DEFAULT_MARK; |
| 382 | case '=': //ïîääåðæêà øàéòàíñêîé êîäèðîâêè ñòðàíèö, ñîõðàí¸ííûõ ÷åðåç ÈÅ7 |
381 | case '=': //ïîääåðæêà øàéòàíñêîé êîäèðîâêè ñòðàíèö, ñîõðàí¸ííûõ ÷åðåç ÈÅ7 |
| 383 | if (strcmp(#URL + strlen(#URL) - 4, ".mht")<>0) goto DEFAULT_MARK; |
382 | if (strcmp(#URL + strlen(#URL) - 4, ".mht")<>0) goto DEFAULT_MARK; |
| 384 | 383 | ||
| Line 471... | Line 470... | ||
| 471 | tag = parametr = tagparam = ignor_param = NULL; |
470 | tag = parametr = tagparam = ignor_param = NULL; |
| 472 | break; |
471 | break; |
| 473 | default: |
472 | default: |
| 474 | DEFAULT_MARK: |
473 | DEFAULT_MARK: |
| - | 474 | if (!pre_text) && (bukva == ' ') |
|
| - | 475 | { |
|
| 475 | if (!pre_text) && (bukva == ' ') && (line[strlen(#line)-1]==' ') break; //óáðàòü 2 ïðîáåëà ïîäðÿä |
476 | if (line[strlen(#line)-1]==' ') break; //óáðàòü 2 ïðîáåëà ïîäðÿä |
| - | 477 | if (!stolbec) && (!line) break; //ñòðîêà íå ìîæåò íà÷èíàòüñÿ ñ ïðîáåëà |
|
| 476 | // |
478 | } |
| - | 479 | if (strlen(#line) |
|
| - | 480 | ||
| 477 | if (stolbec + strlen(#line) > lines.column_max) |
481 | if (stolbec + strlen(#line) > lines.column_max) |
| 478 | { |
482 | { |
| - | 483 | NEXT_MARK: |
|
| 479 | perenos_num = strrchr(#line, ' '); |
484 | perenos_num = strrchr(#line, ' '); |
| - | 485 | if (!perenos_num) && (strlen(#line)>lines.column_max) perenos_num=lines.column_max; |
|
| 480 | strcpy(#temp, #line + perenos_num); //ïåðåíîñ ïî ñëîâàì |
486 | strcpy(#temp, #line + perenos_num); //ïåðåíîñ ïî ñëîâàì |
| 481 | line[perenos_num] = 0x00; |
487 | line[perenos_num] = 0x00; |
| 482 | NEXT_MARK: |
- | |
| 483 | if (stroka >= lines.visible) && (lines.first <>0) break 1; //óõîäèì... |
488 | if (stroka >= lines.visible) && (lines.first <>0) break 1; //óõîäèì... |
| 484 | DrawPage(); |
489 | DrawPage(); |
| 485 | TextGoDown(left + 5, stroka * 10 + top + 5, width - 20); //çàêðàøèâàåì ñëåäóùóþ ñòðîêó |
490 | TextGoDown(left + 5, stroka * 10 + top + 5, width - 20); //çàêðàøèâàåì ñëåäóùóþ ñòðîêó |
| 486 | strcpy(#line, #temp); |
491 | strcpy(#line, #temp); |
| 487 | } |
492 | } |
| 488 | if (!pre_text) && (bukva == ' ') && (!stolbec) && (!line) break; |
- | |
| 489 | if (strlen(#line) |
- | |
| 490 | } |
493 | } |
| 491 | } |
494 | } |
| Line -... | Line 495... | ||
| - | 495 | ||
| 492 | 496 | DrawPage(); //ðèñóåò ïîñëåäíþþ ñòðîêó, ïîòîì ýòî íàäî óáðàòü, îïòèìèçèðîâàâ êîä |
|
| 493 | if (lines.visible * 10 + 25 <= height) |
497 | if (lines.visible * 10 + 25 <= height) |
| 494 | DrawBar(left, lines.visible * 10 + top + 25, width - 15, -lines.visible * 10 + height - 25, bg_color); |
498 | DrawBar(left, lines.visible * 10 + top + 25, width - 15, -lines.visible * 10 + height - 25, bg_color); |
| 495 | if (stroka * 10 + 15 <= height) |
499 | if (stroka * 10 + 15 <= height) |
| 496 | DrawBar(left, stroka * 10 + top + 15, width - 15, -stroka * 10 + height - 15, bg_color); //çàêðàøèâàåì âñ¸ äî êîíöà |
500 | DrawBar(left, stroka * 10 + top + 15, width - 15, -stroka * 10 + height - 15, bg_color); //çàêðàøèâàåì âñ¸ äî êîíöà |