diff options
| -rw-r--r-- | CHANGES | 12 | ||||
| -rw-r--r-- | WWW/Library/Implementation/HTString.c | 7 | ||||
| -rw-r--r-- | lynx.cfg | 5 | ||||
| -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 |
7 files changed, 41 insertions, 14 deletions
diff --git a/CHANGES b/CHANGES index 65c0e9c0..a18e0f0c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,8 +1,18 @@ --- $LynxId: CHANGES,v 1.259 2008/02/17 20:05:07 tom Exp $ +-- $LynxId: CHANGES,v 1.262 2008/02/26 01:17:18 tom Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== +2008-02-?? (2.8.7dev.9) +* use TRST_MAXROWSPAN and TRST_MAXCOLSPAN limits in Stbl_reserveCellsInTable(), + to help the non-color-style version work with table using rowspan/colspan + set to "0" (report by George Sigletos) -TD +* modify behavior of "-nonumbers" option for -dump so it can be combined with + -listonly to obtain a list of the URLs without reference numbers (Debian + #398283) -TD +* typo in description of SESSION_FILE in lynx.cfg -PBM +* build-fix for WWW version on Windows -TD + 2008-02-17 (2.8.7dev.8) * add "nano" to list of editors accepting +number option (patch by Tim Chase) * add configure --with-nss-compat option, for building with NSS library's diff --git a/WWW/Library/Implementation/HTString.c b/WWW/Library/Implementation/HTString.c index 80758a86..7c119a37 100644 --- a/WWW/Library/Implementation/HTString.c +++ b/WWW/Library/Implementation/HTString.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTString.c,v 1.51 2008/02/17 19:30:56 Gisle.Vanem Exp $ + * $LynxId: HTString.c,v 1.52 2008/02/18 00:04:16 tom Exp $ * * Case-independent string comparison HTString.c * @@ -21,6 +21,11 @@ BOOLEAN WWW_TraceFlag = 0; /* Global trace flag for ALL W3 code */ int WWW_TraceMask = 0; /* Global trace flag for ALL W3 code */ #endif +#ifdef _WINDOWS +#undef VC +#define VC "2.14FM" +#endif + #ifndef VC #define VC "2.14" #endif /* !VC */ diff --git a/lynx.cfg b/lynx.cfg index eda6dc10..f04c7989 100644 --- a/lynx.cfg +++ b/lynx.cfg @@ -1,4 +1,4 @@ -# $LynxId: lynx.cfg,v 1.156 2008/02/17 22:26:03 tom Exp $ +# $LynxId: lynx.cfg,v 1.157 2008/02/18 23:51:28 Paul.B.Mahol Exp $ # lynx.cfg file. # The default placement for this file is /usr/local/lib/lynx.cfg (Unix) # or Lynx_Dir:lynx.cfg (VMS) @@ -305,7 +305,8 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/ # (The current working directory may be changed inside lynx) # # If you do not want this feature, leave the setting commented. -# Uses can still customize SESSION_FILE and AUTO_SESSION via their .lynxrc file. +# Users can still customize SESSION_FILE and AUTO_SESSION via +# their .lynxrc file. # #SESSION_FILE:lynx_session 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 |