lynx-dev dev20: patch #1 (misc lost items)

[Leonid Pauzner]

This patch was lost in dev20 integration process,
so I send an updated version here:


* form-based options menu: the bug described in 1999-03-17 changes
  now finally fixed - LP
* fix expanding entities for x-transparent display charset
  (was broken from 1999-03-04 changes) - LP
* chrtrans/def7_uni.tbl - entries with trailing spaces now explicitely enclosed
  in quotes to avoid problems with integrating the patches sent by e-mail,
  more comments added. - LP



I am not sure whether we should discard trailing spaces from
"normal" replacement strings U+1234:la-la-la
to made things more strict.


diff -u old/lyoption.c ./lyoption.c
--- old/lyoption.c      Thu Mar 18 11:05:54 1999
+++ ./lyoption.c        Fri Mar 19 23:31:26 1999
@@ -3922,12 +3922,19 @@
     WWWDoc.bookmark = newdoc->bookmark;
     WWWDoc.isHEAD = newdoc->isHEAD;
     WWWDoc.safe = newdoc->safe;
+    LYforce_no_cache = FALSE;   /* ! */
+    LYoverride_no_cache = TRUE; /* ! */
+       /*
+        * Working out of getfile() cyrcle we reset *no_cache manually here
+        * so HTLoadAbsolute() will return "Document already in memory":
+        * it was forced reloading Options Menu again without this (overhead).
+        *
+        * Probably *no_cache were set in a wrong position because of
+        * the internal page...
+        */
     if (!HTLoadAbsolute(&WWWDoc))
        return(NOT_FOUND);

-    /*** two HTLoadAbsolute() here allow things work correctly,
-     *** sorry for overhead (probably only seen in trace log).
-     ***/

     /*
      *  Return to previous doc, not to options menu!
@@ -3941,6 +3948,15 @@
     WWWDoc.bookmark = newdoc->bookmark;
     WWWDoc.isHEAD = newdoc->isHEAD;
     WWWDoc.safe = newdoc->safe;
+    LYforce_no_cache = FALSE;   /* see below */
+    LYoverride_no_cache = TRUE; /* see below */
+       /*
+        * Re-setting of *no_cache probably not required here
+        * but this is a guarantee against _double_ reloading over the net
+        * in case prev document have its own "no cache" attribute
+        * and options menu set "need_reload" also.
+        * Force this HTLoadAbsolute() to return "Document already in memory".
+        */
     if (!HTLoadAbsolute(&WWWDoc))
        return(NOT_FOUND);

diff -u old/ucdomap.h ./ucdomap.h
--- old/ucdomap.h       Thu Mar 18 11:05:58 1999
+++ ./ucdomap.h Thu Mar 18 11:24:12 1999
@@ -76,34 +76,34 @@
    *  from Unicode mechanism).  For now we use the MIME name that describes
    *  what is output to the terminal. - KW
    */
-static CONST struct unimapdesc_str dfont_replacedesc_Asian = {0,NULL,0,1};
+static CONST struct unimapdesc_str dfont_replacedesc_fallback = {0,NULL,0,1};

 #define UC_CHARSET_SETUP_euc_cn UC_Charset_Setup("euc-cn","Chinese",\
-       NULL,NULL,0,dfont_replacedesc_Asian,\
+       NULL,NULL,0,dfont_replacedesc_fallback,\
        128,UCT_ENC_CJK,0)
 #define UC_CHARSET_SETUP_euc_jp UC_Charset_Setup("euc-jp","Japanese (EUC-JP)",\
-       NULL,NULL,0,dfont_replacedesc_Asian,\
+       NULL,NULL,0,dfont_replacedesc_fallback,\
        128,UCT_ENC_CJK,0)
 #define UC_CHARSET_SETUP_shift_jis UC_Charset_Setup("shift_jis","Japanese 
(Shift_JIS)",\
-       NULL,NULL,0,dfont_replacedesc_Asian,\
+       NULL,NULL,0,dfont_replacedesc_fallback,\
        128,UCT_ENC_CJK,0)
 #define UC_CHARSET_SETUP_euc_kr UC_Charset_Setup("euc-kr","Korean",\
-       NULL,NULL,0,dfont_replacedesc_Asian,\
+       NULL,NULL,0,dfont_replacedesc_fallback,\
        128,UCT_ENC_CJK,0)
 #define UC_CHARSET_SETUP_big5 UC_Charset_Setup("big5","Taipei (Big5)",\
-       NULL,NULL,0,dfont_replacedesc_Asian,\
+       NULL,NULL,0,dfont_replacedesc_fallback,\
        128,UCT_ENC_CJK,0)
   /*
    *  Placeholder for non-translation mode. - FM
    */
-static CONST struct unimapdesc_str dfont_replacedesc_trans = {0,NULL,0,0};
-
 #define UC_CHARSET_SETUP_x_transparent 
UC_Charset_Setup("x-transparent","Transparent",\
-       NULL,NULL,0,dfont_replacedesc_trans,\
+       NULL,NULL,0,dfont_replacedesc_fallback,\
        128,1,0)

+static CONST struct unimapdesc_str dfont_replacedesc_NO_fallback = 
{0,NULL,0,0};
+
 #define UC_CHARSET_SETUP_utf_8 UC_Charset_Setup("utf-8","UNICODE (UTF-8)",\
-       NULL,NULL,0,dfont_replacedesc_trans,\
+       NULL,NULL,0,dfont_replacedesc_NO_fallback,\
        128,UCT_ENC_UTF8,0)


diff -u old/readme.for ./readme.for
--- old/readme.for      Sat Dec 12 20:10:36 1998
+++ ./readme.for        Thu Mar 18 16:05:52 1999
@@ -102,7 +102,8 @@
   in certain charset table will override ones from the Default table.

   Note that everything after the ':' is currently taken VERBATIM, so
-  careful with trailing blanks etc.
+  careful with trailing blanks etc.  Please use <C replace> syntax below
+  when you need trailing spaces.

  * Syntax accepted:
  *      <unicode>      :<replace>


diff -u old/def7_uni.tbl ./def7_uni.tbl
--- old/def7_uni.tbl    Thu Mar 18 11:05:12 1999
+++ ./def7_uni.tbl      Thu Mar 18 16:31:02 1999
@@ -1,10 +1,19 @@
-# Default 7bit replacements.  If the MIME name is set to us-ascii,
-# this will be identified with the "7 bit approximations (US-ASCII)" Display
-# character set.
+# Default 7bit replacements.
+#
+# This table very important and should not be excluded from the distribution
+# since this is a default fallback for any 8bit user's "display character set"
+# which (nearly) of 256 chars and could not map a rich Unicode repertoire.
+#
+# Note: few rare replacement strings with trailing spaces
+# should be enclosed as C strings like "... " to make things obvious
+# (and doing that we should escape \ as \134 and  escape " as \" or \042
+# but this is really rare).
+#

 #The MIME name of this charset.
 Mus-ascii

+# Like any other charset this may be selected as "display character set":
 #Name as a Display Charset (used on Options screen)
 O7 bit approximations (US-ASCII)

@@ -14,7 +23,7 @@


 # us-ascii characters should not normally pass here,
-# they are always processed directly but let declare it here:
+# they are always processed directly but let declare them here:
 0x20-0x7e  idem


@@ -421,11 +430,11 @@
 U+03cd:u%
 U+03ce:w%
 # Greek symbols
-U+03d0:beta
-U+03d1:theta
-U+03d2:upsi
-U+03d5:phi
-U+03d6:pi
+U+03d0 "beta "
+U+03d1 "theta "
+U+03d2 "upsi "
+U+03d5 "phi "
+U+03d6 "pi "
 U+03da:T3
 U+03db:t3
 U+03dc:M3
@@ -434,8 +443,8 @@
 U+03df:k3
 U+03e0:P3
 U+03e1:p3
-U+03f0:kappa
-U+03f1:rho
+U+03f0 "kappa "
+U+03f1 "rho "
 U+03f4:'%
 U+03f5:j3
 # Cyrillic capital letters
@@ -1291,7 +1300,7 @@
 U+200f:(<-)
 U+200a:
 0x2d   U+2010  U+2013 U+2015   # hyphen-like
-U+2014:--
+U+2014 "--"
 U+2016:||
 U+2017:=2
 0x60   U+2018          # left single quotation mark  <`>
@@ -1299,7 +1308,7 @@
 0x22   U+201c-U+201f   # various double quotation marks <">
 U+2020:/-
 U+2021:/=
-U+2022: o
+U+2022 " o "
 U+2025:..
 U+2026:...

@@ -1377,10 +1386,10 @@
 0x4b   U+212A  # Kelvin sign - K
 U+212b:Ang.
 U+212E:est.
-U+2135:Aleph
-U+2136:Bet
-U+2137:Gimel
-U+2138:Dalet
+U+2135 "Aleph "
+U+2136 "Bet "
+U+2137 "Gimel "
+U+2138 "Dalet "
 U+2153: 1/3
 U+2154: 2/3
 U+2155: 1/5
@@ -1463,7 +1472,7 @@
 U+2217:*
 U+2218:Ob
 U+2219:sb
-U+221a: SQRT
+U+221a " SQRT "
 U+221d:0(
 U+221e:infty
 U+221f:-L