← Back to branch summary

~ubuntu-branches/ubuntu/quantal/elinks/quantal

« back to all changes in this revision

Viewing changes to src/document/html/renderer.c

  • Committer: Bazaar Package Importer
  • Author(s): Siegfried-Angel Gevatter Pujals (RainCT)
  • Date: 2008-02-01 16:29:06 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20080201162906-xdourui5tyjva0al
Tags: 0.11.3-5ubuntu1
https://launchpad.net/bugs/187936
 
* Merge from Debian unstable (LP: #187936); remaining changes:
  - Add X-Ubuntu-Gettext-Domain to .desktop files.
  - debian/control: Maintainer field update.
* Improve the text in the .desktop file and add some translations.
 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/document/html/renderer.c
643
643
        move_links(html_context, x, y, -1, -1);
644
644
}
645
645
 
646
 
#define overlap(x) int_max((x).width - (x).rightmargin, 0)
 
646
#if TABLE_LINE_PADDING < 0
 
647
# define overlap_width(x) (x).width
 
648
#else
 
649
# define overlap_width(x) int_min((x).width, \
 
650
        html_context->options->box.width - TABLE_LINE_PADDING)
 
651
#endif
 
652
#define overlap(x) int_max(overlap_width(x) - (x).rightmargin, 0)
647
653
 
648
654
static int inline
649
655
split_line_at(struct html_context *html_context, int width)
1379
1385
        part->cx += charslen;
1380
1386
        renderer_context.nobreak = 0;
1381
1387
 
1382
 
        if (!html_is_preformatted()) {
 
1388
        if (!(html_context->options->wrap || html_is_preformatted())) {
1383
1389
                while (part->cx > overlap(par_format)
1384
1390
                       && part->cx > par_format.leftmargin) {
1385
1391
                        int x = split_line(html_context);
1724
1730
                        unsigned long seconds = va_arg(l, unsigned long);
1725
1731
                        unsigned char *t = va_arg(l, unsigned char *);
1726
1732
 
1727
 
                        document->refresh = init_document_refresh(t, seconds);
 
1733
                        if (document) {
 
1734
                                if (document->refresh)
 
1735
                                        done_document_refresh(document->refresh);
 
1736
                                document->refresh = init_document_refresh(t, seconds);
 
1737
                        }
1728
1738
                        break;
1729
1739
                }
1730
1740
                case SP_COLOR_LINK_LINES: