Rev 8339 | Rev 8355 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 8339 | Rev 8350 | ||
|---|---|---|---|
| Line 156... | Line 156... | ||
| 156 | line_len = strlen(#line); |
156 | line_len = strlen(#line); |
| 157 | if (!style.pre) && (_char == ' ') |
157 | if (!style.pre) && (_char == ' ') |
| 158 | { |
158 | { |
| 159 | if (line[line_len-1]==' ') return; //no double spaces |
159 | if (line[line_len-1]==' ') return; //no double spaces |
| 160 | if (!stolbec) && (!line) return; //no paces at the beginning of the line |
160 | if (!stolbec) && (!line) return; //no paces at the beginning of the line |
| - | 161 | if (link) && (line_len==0) return; |
|
| 161 | } |
162 | } |
| 162 | if (line_len < sizeof(line)) chrcat(#line, _char); |
163 | if (line_len < sizeof(line)) chrcat(#line, _char); |
| 163 | CheckForLineBreak(); |
164 | CheckForLineBreak(); |
| 164 | } |
165 | } |
| 165 | //============================================================================================ |
166 | //============================================================================================ |
| Line 466... | Line 467... | ||
| 466 | img.h.add(ESDWORD[EDI+8]); |
467 | img.h.add(ESDWORD[EDI+8]); |
| 467 | img_destroy stdcall(EDI); |
468 | img_destroy stdcall(EDI); |
| Line 468... | Line 469... | ||
| 468 | 469 | ||
| Line 469... | Line 470... | ||
| 469 | img.url.add(#img_path); |
470 | img.url.add(#img_path); |
| 470 | 471 | ||
| 471 | if (img.w.get_last() / 6 + 1 + stolbec > list.column_max) { |
472 | if (img.w.get_last() / 6 + stolbec > list.column_max) { |
| 472 | NewLine(); |
473 | NewLine(); |
| 473 | } |
474 | } |
| Line 474... | Line 475... | ||
| 474 | img.x.add(stolbec*list.font_w+3); |
475 | img.x.add(stolbec*list.font_w+3); |
| - | 476 | img.y.add(draw_y); |
|
| Line 475... | Line 477... | ||
| 475 | img.y.add(draw_y); |
477 | |
| 476 | 478 | stolbec += img.w.get_last() / 6; |
|
| 477 | stolbec += img.w.get_last() / 6 + 1; |
479 | if (stolbec > list.column_max) NewLine(); |
| 478 | 480 | ||
| Line 486... | Line 488... | ||
| 486 | img.y.get_last() + list.y, |
488 | img.y.get_last() + list.y, |
| 487 | img.w.get_last(), |
489 | img.w.get_last(), |
| 488 | img.h.get_last(), |
490 | img.h.get_last(), |
| 489 | 0); |
491 | 0); |
| Line 490... | Line -... | ||
| 490 | - | ||
| Line 491... | Line 492... | ||
| 491 | //debugval(img.url.get_last(), img.y.get_last()); |
492 | |
| 492 | 493 | ||
| 493 | return; |
494 | return; |
| 494 | } else { |
495 | } else { |
| Line 509... | Line 510... | ||
| 509 | if (value = tag.get_value_of("title=")) && (strlen(value) |
510 | if (value = tag.get_value_of("title=")) && (strlen(value) |
| 510 | if (value = tag.get_value_of("alt=")) && (strlen(value) |
511 | if (value = tag.get_value_of("alt=")) && (strlen(value) |
| 511 | if (!line) { |
512 | if (!line) { |
| 512 | if (!strncmp(#img_path, "data:", 5)) img_path=0; |
513 | if (!strncmp(#img_path, "data:", 5)) img_path=0; |
| 513 | replace_char(#img_path, '?', NULL, strlen(#img_path)); |
514 | replace_char(#img_path, '?', NULL, strlen(#img_path)); |
| - | 515 | img_path[sizeof(line)-3] = '\0'; //prevent overflow in sprintf |
|
| 514 | sprintf(#line, "[%s]", #img_path+strrchr(#img_path, '/')); |
516 | sprintf(#line, "[%s]", #img_path+strrchr(#img_path, '/')); |
| 515 | line[50]= NULL; |
517 | line[50]= NULL; |
| 516 | } |
518 | } |
| 517 | while (CheckForLineBreak()) {}; |
519 | while (CheckForLineBreak()) {}; |