diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2024-03-15 19:08:31 +0000 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2024-03-16 00:09:25 +0000 |
| commit | e8ca7e6d6dbc321ee1b563214040e74c45129853 (patch) | |
| tree | a701f15bbaf1d331636635bc26080bcbb7c68894 /src | |
| parent | e990a678633ad6a4651cf1f0e195e87b755ee0be (diff) | |
| download | lynx-snapshots-e8ca7e6d6dbc321ee1b563214040e74c45129853.tar.gz | |
snapshot of project "lynx", label v2-9-0c
Diffstat (limited to 'src')
| -rw-r--r-- | src/LYBookmark.c | 3 | ||||
| -rw-r--r-- | src/LYCharSets.c | 35 | ||||
| -rw-r--r-- | src/LYIcon.rc | 10 |
3 files changed, 15 insertions, 33 deletions
diff --git a/src/LYBookmark.c b/src/LYBookmark.c index ee88cf95..73416fc1 100644 --- a/src/LYBookmark.c +++ b/src/LYBookmark.c @@ -1,5 +1,5 @@ /* - * $LynxId: LYBookmark.c,v 1.88 2023/01/07 16:09:53 tom Exp $ + * $LynxId: LYBookmark.c,v 1.89 2024/03/15 10:04:29 KIHARA.Hideto Exp $ */ #include <HTUtils.h> #include <HTAlert.h> @@ -1029,6 +1029,7 @@ static BOOLEAN havevisible(const char *Title) unsigned char c; long unicode; + UCTransToUni(0, -1); /* reset internal state */ for (; *p; p++) { c = UCH(TOASCII(*p)); if (c > 32 && c < 127) { diff --git a/src/LYCharSets.c b/src/LYCharSets.c index 94b7a04f..f5f16338 100644 --- a/src/LYCharSets.c +++ b/src/LYCharSets.c @@ -1,5 +1,5 @@ /* - * $LynxId: LYCharSets.c,v 1.71 2021/06/29 22:01:12 tom Exp $ + * $LynxId: LYCharSets.c,v 1.74 2024/03/15 16:15:07 tom Exp $ */ #include <HTUtils.h> #include <HTCJK.h> @@ -605,34 +605,15 @@ static void HTMLSetDisplayCharsetMatchLocale(int i) * We have no intention to pass CJK via UCTransChar if that happened. * Let someone from CJK correct this if necessary. */ - DisplayCharsetMatchLocale = TRUE; /* old-style */ - return; - - } else if (strncasecomp(LYCharSet_UC[i].MIMEname, "cp", 2) || - strncasecomp(LYCharSet_UC[i].MIMEname, "windows", 7)) { - /* - * Assume dos/windows displays usually on remote terminal, hence it - * rarely matches locale. (In fact, MS Windows codepoints locale are - * never seen on UNIX). - */ - match = FALSE; + match = TRUE; /* old-style */ + } else if (!strncasecomp(LYCharSet_UC[i].MIMEname, "cp", 2) || + !strncasecomp(LYCharSet_UC[i].MIMEname, "windows", 7)) { + match = FALSE; /* Windows locale is never seen on UNIX */ } else { - match = TRUE; /* guess, but see below */ - -#if !defined(LOCALE) - if (LYCharSet_UC[i].enc != UCT_ENC_UTF8) - /* - * Leave true for utf-8 display - the code doesn't deal very well - * with this case. - kw - */ - match = FALSE; +#if defined(LOCALE) + match = !UCForce8bitTOUPPER; /* disable locale (from lynx.cfg) */ #else - if (UCForce8bitTOUPPER) { - /* - * Force disable locale (from lynx.cfg) - */ - match = FALSE; - } + match = (LYCharSet_UC[i].enc == UCT_ENC_UTF8); #endif } diff --git a/src/LYIcon.rc b/src/LYIcon.rc index da45f310..d5aa8fc4 100644 --- a/src/LYIcon.rc +++ b/src/LYIcon.rc @@ -1,12 +1,12 @@ -// $LynxId: LYIcon.rc,v 1.59 2024/03/14 00:20:31 tom Exp $ +// $LynxId: LYIcon.rc,v 1.60 2024/03/15 09:58:36 tom Exp $ #include <windows.h> 100 ICON "../samples/lynx.ico" VS_VERSION_INFO VERSIONINFO -FILEVERSION 2,9,0,2002 -PRODUCTVERSION 2,9,0,2002 +FILEVERSION 2,9,0,2003 +PRODUCTVERSION 2,9,0,2003 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "https://invisible-island.net/lynx" VALUE "FileDescription", "Lynx - web browser" - VALUE "FileVersion", "2.9.0.2002" + VALUE "FileVersion", "2.9.0.2003" VALUE "InternalName", "Lynx" VALUE "LegalCopyright", "©1997-2024 Thomas E. Dickey" VALUE "OriginalFilename", "lynx.exe" VALUE "ProductName", "Lynx - web browser" - VALUE "ProductVersion", "2.9.0.2002" + VALUE "ProductVersion", "2.9.0.2003" END END BLOCK "VarFileInfo" |