lynx-dev [PATCH 2.8.4pre.4] Display charset autoswitch

[Ilya Zakharevich]

The logic to auto-switch the display charset got busted sometime ago.

Enjoy,
Ilya

--- ./src/UCAuto.c-pre  Sun Jun  3 11:58:00 2001
+++ ./src/UCAuto.c      Thu Jul 12 17:27:20 2001
@@ -649,6 +649,9 @@ PRIVATE int _Switch_Display_Charset ARGS
        font_loaded_for = ord1;
        old_h = font->cyCell;
        old_w = font->cxCell;
+    } else {
+       ord = ord1 = auto_display_charset;
+       goto retry;
     }
   report:
     CTRACE((tfp, "Display font set to '%s'.\n", name));
--- ./src/LYReadCFG.c-pre       Tue Jul 10 09:05:58 2001
+++ ./src/LYReadCFG.c   Thu Jul 12 17:20:50 2001
@@ -1262,8 +1262,8 @@ PRIVATE Config_Type Config_Table [] =
      PARSE_SET("case_sensitive_always_on", case_sensitive),
      PARSE_FUN("character_set",        character_set_fun),
 #ifdef CAN_SWITCH_DISPLAY_CHARSET
-     PARSE_SET("charset_switch_rules", charset_switch_rules),
-     PARSE_SET("charsets_directory",   charsets_directory),
+     PARSE_STR("charset_switch_rules", charset_switch_rules),
+     PARSE_STR("charsets_directory",   charsets_directory),
 #endif
      PARSE_SET("checkmail",            check_mail),
      PARSE_SET("collapse_br_tags",     LYCollapseBRs),
--- ./lynx.cfg-pre      Sat Jul  7 17:30:12 2001
+++ ./lynx.cfg  Thu Jul 12 17:48:04 2001
@@ -553,6 +553,40 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.
 #PREFERRED_CHARSET:
 
 
+.h2 CHARSETS_DIRECTORY
+# CHARSETS_DIRECTORY specifies the directory with the fonts (glyph data)
+# used by Lynx to switch the display-font to a font best suited for the
+# given document.  The font should be in a format understood by the 
+# platforms TTY-display-font-switching API.  Currently supported on OS/2 only.
+#
+# Lynx expects the glyphs for the charset CHARSET with character cell
+# size HHHxWWW to be stored in a file HHHxWWW/CHARSET.fnt inside the directory
+# specified by CHARSETS_DIRECTORY.  E.g., the font for koi8-r sized 14x9
+# should be in the file 14x9/koi8-r.fnt.
+#
+#CHARSETS_DIRECTORY:
+
+
+.h2 CHARSET_SWITCH_RULES
+# CHARSET_SWITCH_RULES hints lynx on how to choose the best display
+# font given the document encoding.  This strings is a sequence of
+# chunks, each chunk having the following form:
+#
+# IN_CHARSET1 IN_CHARSET2 ... IN_CHARSET5 :OUT_CHARSET
+#
+# For readability, one may insert arbitrary additional punctuation (anything
+# but : is ignored).  E.g., if lynx is able to switch only to display charsets
+# cp866, cp850, cp852, and cp862, then the following setting may be useful
+# (split for readablity):
+#
+# CHARSET_SWITCH_RULES: koi8-r ISO-8859-5 windows-1251 cp866u KOI8-U :cp866,
+#      iso-8859-1 windows-1252 ISO-8859-15 :cp850,
+#      ISO-8859-2 windows-1250 :cp852,
+#      ISO-8859-8 windows-1255 :cp862
+#
+#CHARSET_SWITCH_RULES:
+
+
 .h1 Interaction
 
 .h2 URL_DOMAIN_PREFIXES

; To UNSUBSCRIBE: Send "unsubscribe lynx-dev" to address@hidden