diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2008-02-26 01:17:18 -0500 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2008-02-26 01:17:18 -0500 |
| commit | 272f214bc1b3f49999c0c30c9cd6059654f36a3f (patch) | |
| tree | c673a566884e35c7440ef2916fec44e6860d76de /src | |
| parent | 664260d58a3df398f73657f0fe4f9aac162c72bf (diff) | |
| download | lynx-snapshots-272f214bc1b3f49999c0c30c9cd6059654f36a3f.tar.gz | |
snapshot of project "lynx", label v2-8-7dev_8a
Diffstat (limited to 'src')
| -rw-r--r-- | src/LYList.c | 12 | ||||
| -rw-r--r-- | src/LYMain.c | 5 | ||||
| -rw-r--r-- | src/TRSTable.c | 8 | ||||
| -rw-r--r-- | src/chrtrans/make-msc.bat | 6 |
4 files changed, 21 insertions, 10 deletions
diff --git a/src/LYList.c b/src/LYList.c index 8ab0df40..f1687986 100644 --- a/src/LYList.c +++ b/src/LYList.c @@ -273,7 +273,9 @@ static void print_refs(FILE *fp, BOOLEAN titles, int refs) parent = HTAnchor_parent(dest); title = titles ? HTAnchor_title(parent) : NULL; address = HTAnchor_address(dest); - fprintf(fp, "%4d. %s%s\n", cnt, + if (links_are_numbered()) + fprintf(fp, "%4d. ", cnt); + fprintf(fp, "%s%s\n", ((HTAnchor *) parent != dest) && title ? "in " : "", (title ? title : address)); FREE(address); @@ -297,7 +299,10 @@ static void print_hidden_refs(FILE *fp, int refs, int hidden_links) FREE(address); continue; } - fprintf(fp, "%4d. %s\n", ((cnt + 1) + refs), address); + + if (links_are_numbered()) + fprintf(fp, "%4d. ", ((cnt + 1) + refs)); + fprintf(fp, "%s\n", address); FREE(address); #ifdef VMS if (HadVMSInterrupt) @@ -323,7 +328,8 @@ void printlist(FILE *fp, BOOLEAN titles) if (refs > 0 || LYHiddenLinks == HIDDENLINKS_SEPARATE) { hidden_links = HText_HiddenLinkCount(HTMainText); if (refs > 0 || hidden_links > 0) { - fprintf(fp, "\n%s\n\n", gettext("References")); + if (links_are_numbered() || fields_are_numbered()) + fprintf(fp, "\n%s\n\n", gettext("References")); if (LYHiddenLinks == HIDDENLINKS_IGNORE) hidden_links = 0; if (hidden_links > 0) { diff --git a/src/LYMain.c b/src/LYMain.c index f98c94e9..b998a98d 100644 --- a/src/LYMain.c +++ b/src/LYMain.c @@ -1,4 +1,4 @@ -/* $LynxId: LYMain.c,v 1.181 2008/02/17 19:30:56 Gisle.Vanem Exp $ */ +/* $LynxId: LYMain.c,v 1.182 2008/02/19 00:53:35 tom Exp $ */ #include <HTUtils.h> #include <HTTP.h> #include <HTParse.h> @@ -2142,8 +2142,7 @@ int main(int argc, i + 1, HTList_count(Goto_URLs), startfile)); status = mainloop(); if (!no_list && - !crawl && /* For -crawl it has already been done! */ - links_are_numbered()) + !crawl) /* For -crawl it has already been done! */ printlist(stdout, FALSE); if (i != 0) printf("\n"); diff --git a/src/TRSTable.c b/src/TRSTable.c index f8ec81b8..ab68c8fb 100644 --- a/src/TRSTable.c +++ b/src/TRSTable.c @@ -1,4 +1,6 @@ -/* Simple table object +/* + * $LynxId: TRSTable.c,v 1.20 2008/02/26 01:09:13 tom Exp $ + * Simple table object * =================== * Authors * KW Klaus Weide <kweide@enteract.com> @@ -957,6 +959,10 @@ static int Stbl_reserveCellsInTable(STable_info *me, int icell, int growby; int i; + if (colspan > TRST_MAXCOLSPAN) + return -1; + if (rowspan > TRST_MAXROWSPAN) + return -1; if (me->nrows <= 0) return -1; /* must already have at least one row */ diff --git a/src/chrtrans/make-msc.bat b/src/chrtrans/make-msc.bat index e9fbacf7..81d615e0 100644 --- a/src/chrtrans/make-msc.bat +++ b/src/chrtrans/make-msc.bat @@ -1,6 +1,6 @@ -@rem $LynxId: make-msc.bat,v 1.5 2007/06/28 21:07:24 tom Exp $ +@rem $LynxId: make-msc.bat,v 1.6 2008/02/18 00:34:44 tom Exp $ @echo off -nmake -f makefile.msc +nmake -f makefile.msc %1 %2 %3 %4 %5 %6 %7 %8 %9 -call makehdrs +if exist makeuctb.exe call makehdrs |