snapshot of project "lynx", label v2-8-6dev_8

5 files changed, 86 insertions, 26 deletions

diff --git a/src/chrtrans/build-chrtrans.com b/src/chrtrans/build-chrtrans.com
index ac8c932d..11e44c02 100644
--- a/src/chrtrans/build-chrtrans.com
+++ b/src/chrtrans/build-chrtrans.com
@@ -1,4 +1,5 @@
-$ v = 'f$verify(0)'
+$ v0 = 0
+$ v = f$verify(v0)
 $!			BUILD-CHRTRANS.COM
 $!
 $!   Command file to build MAKEUCTB.EXE on VMS systems
@@ -27,8 +28,10 @@ $ v1 = f$verify(1)
 $!
 $!	Compile the Lynx [.SRC.CHRTRANS]makeuctb module.
 $!
-$  v1 = 'f$verify(0)'
-$ IF f$trnlnm("VAXCMSG") .eqs. "DECC$MSG" .or. -
+$  v1 = f$verify(v0)
+$ IF f$getsyi("ARCH_NAME") .eqs. "Alpha" .or. -
+     f$getsyi("ARCH_NAME") .eqs. "IA64" .or. -
+     f$trnlnm("VAXCMSG") .eqs. "DECC$MSG" .or. -
      f$trnlnm("DECC$CC_DEFAULT") .eqs. "/DECC" .or. -
      f$trnlnm("DECC$CC_DEFAULT") .eqs. "/VAXC"
 $ THEN
@@ -37,7 +40,7 @@ $  v1 = f$verify(1)
 $! DECC:
 $  cc := cc/decc/prefix=all /nomember 'CHRcc_opts'-
 	   /INCLUDE=([],[-],[--],[--.WWW.Library.Implementation]) 
-$  v1 = 'f$verify(0)'
+$  v1 = f$verify(v0)
 $ ELSE
 $  IF f$search("gnu_cc:[000000]gcclib.olb") .nes. ""
 $  THEN
@@ -45,19 +48,19 @@ $   CHRcompiler := "GNUC"
 $   v1 = f$verify(1)
 $! GNUC:
 $   cc := gcc 'CHRcc_opts'/INCLUDE=([],[-],[--],[--.WWW.Library.Implementation]) 
-$   v1 = 'f$verify(0)'
+$   v1 = f$verify(v0)
 $  ELSE
 $   CHRcompiler := "VAXC"
 $   v1 = f$verify(1)
 $! VAXC:
 $   cc := cc 'CHRcc_opts'/INCLUDE=([],[-],[--],[--.WWW.Library.Implementation]) 
-$   v1 = 'f$verify(0)'
+$   v1 = f$verify(v0)
 $  ENDIF
 $ ENDIF
 $!
 $ v1 = f$verify(1)
 $ cc makeuctb
-$ v1 = 'f$verify(0)'
+$ v1 = f$verify(v0)
 $!
 $ Link_makeuctb:
 $!=============
@@ -65,9 +68,15 @@ $ v1 = f$verify(1)
 $!
 $!	Link the Lynx [.SRC.CHRTRANS]makeuctb module.
 $!
-$ link/exe=makeuctb.exe'CHRlink_opts' makeuctb, -
-sys$disk:[-]'CHRcompiler'.opt/opt
-$ v1 = 'f$verify(0)'
+$ IF f$getsyi("ARCH_NAME") .eqs. "IA64"
+$ THEN
+$    optslibs=""
+$ ELSE
+$    optslibs=", sys$disk:[-]''CHRcompiler'.opt/opt"
+$ ENDIF
+$
+$ link/exe=makeuctb.exe'CHRlink_opts' makeuctb 'optslibs
+$ v1 = f$verify(v0)
 $!
 $ Create_headers:
 $!==============
@@ -118,11 +127,11 @@ $ makeuctb pt154_uni.tbl
 $ makeuctb rfc_suni.tbl
 $ makeuctb utf8_uni.tbl
 $ makeuctb viscii_uni.tbl
-$ v1 = 'f$verify(0)'
+$ v1 = f$verify(v0)
 $ exit
 $!
 $ CLEANUP:
-$    v1 = 'f$verify(0)'
+$    v1 = f$verify(0)
 $    write sys$output "Default directory:"
 $    show default
 $    v1 = f$verify(v)
diff --git a/src/chrtrans/build-header.com b/src/chrtrans/build-header.com
index c1e9d087..ff8a6f52 100644
--- a/src/chrtrans/build-header.com
+++ b/src/chrtrans/build-header.com
@@ -1,4 +1,5 @@
-$ v = 'f$verify(0)'
+$ v0 = 0
+$ v = f$verify(v0)
 $!			BUILD-HEADER.COM
 $!
 $!   Command file to use MAKEUCTB.EXE on VMS systems for creating
@@ -25,11 +26,11 @@ $!	Create a Lynx [.SRC.CHRTRANS] header file.
 $!
 $ makeuctb := $'CHRwhere'makeuctb
 $ makeuctb 'P1'.tbl
-$ v1 = 'f$verify(0)'
+$ v1 = f$verify(v0)
 $ exit
 $!
 $ CLEANUP:
-$    v1 = 'f$verify(0)'
+$    v1 = f$verify(v0)
 $    write sys$output "Default directory:"
 $    show default
 $    v1 = f$verify(v)
diff --git a/src/chrtrans/def7_uni.tbl b/src/chrtrans/def7_uni.tbl
index f25e84f1..211e2614 100644
--- a/src/chrtrans/def7_uni.tbl
+++ b/src/chrtrans/def7_uni.tbl
@@ -6,7 +6,7 @@
 #
 # Note: there are a few rare replacement strings with trailing spaces
 # which should be enclosed as C strings like "... " to make things obvious
-# (and doing that we should escape \ as \134 and  escape " as \" or \042
+# (and doing that we should escape \ as \134 and escape " as \" or \042
 # but this is really rare).
 #
 
@@ -1858,20 +1858,49 @@ U+25d9:Ic
 U+25e2:Fd
 U+25e3:Bd
 U+25ef:Ci
+U+2600:SU	# cf. U+263c
 U+2605:*2
 U+2606:*1
 U+260e:TEL
 U+260f:tel
+U+261a:<==
+U+261b:==>
 U+261c:<--
 U+261e:-->
-U+2621 "CAUTION "
+U+2620:!X!	# or "POISON ", cf. U+2621
+U+2621:!C!	# previously "CAUTION " - or is it better to leave it spelled out in English?
+U+2622:!R!	# or "RADIOACTIVE ", cf. U+2621
+U+2623:!B!	# or "BIOHAZARD ", cf. U+2621
+U+2624:|S
 U+2627:XP
+U+262f:Pd
 U+2639::-(
 U+263a::-)
 U+263b:(-:
-U+263c:SU
-U+2640:f.
-U+2642:m.
+U+263c:su	# previously "SU" - cf. U+2600, typical to have "dark" character in uppercase, eg. U+260e, U+260f
+U+263d:Lun1	# Luna, 1st quarter
+U+263e:Lun3	# Luna, 3rd quarter
+U+263f:Mer
+U+2640:Ven	# previously "f." - this section labeled as astrological symbols
+U+2641:Ter	# Terra, to go with other Latin names
+U+2642:Mar	# previously "m." - this section labeled as astrological symbols
+U+2643:Jup
+U+2644:Sat
+U+2645:Ura
+U+2646:Nep
+U+2647:Plu
+U+2648:Ari	# Standard astronomical abbreviation
+U+2649:Tau	# Standard astronomical abbreviation
+U+264a:Gem	# Standard astronomical abbreviation
+U+264b:Cnc	# Standard astronomical abbreviation
+U+264c:Leo	# Standard astronomical abbreviation
+U+264d:Vir	# Standard astronomical abbreviation
+U+264e:Lib	# Standard astronomical abbreviation
+U+264f:Sco	# Standard astronomical abbreviation
+U+2650:Sgr	# Standard astronomical abbreviation
+U+2651:Cap	# Standard astronomical abbreviation
+U+2652:Aqr	# Standard astronomical abbreviation
+U+2653:Psc	# Standard astronomical abbreviation
 U+2660:cS
 U+2661:cH
 U+2662:cD
@@ -1887,6 +1916,26 @@ U+266c:M16
 U+266d:b
 U+266e:Mx
 U+266f:#
+U+2672:recyc
+U+2673:Recy1
+U+2674:Recy2
+U+2675:Recy3
+U+2676:Recy4
+U+2677:Recy5
+U+2678:Recy6
+U+2679:Recy7
+U+267a:Recy
+U+267b:Recyc
+U+267c:oRecy
+U+267d:orecy
+U+2680:d1
+U+2681:d2
+U+2682:d3
+U+2683:d4
+U+2684:d5
+U+2685:d6
+U+26a0:!W!	# or "WARNING ", cf. U+2621
+U+26a1:!V!	# or "VOLTAGE ", cf. U+2621
 0x58	U+2713	U+2717	# check marks -> x
 U+2720:-X
 #  CJK area:
diff --git a/src/chrtrans/entities.h b/src/chrtrans/entities.h
index f843be3b..e5cf2c8b 100644
--- a/src/chrtrans/entities.h
+++ b/src/chrtrans/entities.h
@@ -23,7 +23,7 @@ otherwise relaxed.
 
 #include <UCkd.h>		/* typedef u16 */
 typedef struct {
-    char *name;			/* sorted alphabetically (case-sensitive) */
+    const char *name;		/* sorted alphabetically (case-sensitive) */
     u16 code;
 } UC_entity_info;
 
diff --git a/src/chrtrans/makeuctb.c b/src/chrtrans/makeuctb.c
index a71cf20c..a5a1c122 100644
--- a/src/chrtrans/makeuctb.c
+++ b/src/chrtrans/makeuctb.c
@@ -141,8 +141,8 @@ int unicount[MAX_FONTLEN];
 struct unimapdesc_str themap_str =
 {0, NULL, 0, 0};
 
-static char *tblname;
-static char *hdrname;
+static const char *tblname;
+static const char *hdrname;
 
 static int RawOrEnc = 0;
 static int Raw_found = 0;	/* whether explicit R directive found */
@@ -248,7 +248,7 @@ int lowest_eight = 999;
 
 int main(int argc, char **argv)
 {
-    static char *first_ifdefs[] =
+    static const char *first_ifdefs[] =
     {
 	"/*",
 	" * Compile-in this chunk of code unless we've turned it off specifically",
@@ -279,7 +279,7 @@ int main(int argc, char **argv)
 	"#define UC_CHARSET_SETUP%s /*nothing*/",
 	"#else"
     };
-    static char *last_ifdefs[] =
+    static const char *last_ifdefs[] =
     {
 	"",
 	"#endif /* NO_CHARSET%s */",
@@ -323,7 +323,8 @@ int main(int argc, char **argv)
 	chdr = stdout;
 	hdrname = "stdout";
     } else {
-	strcpy(hdrname = outname, tblname);
+	strcpy(outname, tblname);
+	hdrname = outname;
 	if ((p = strrchr(outname, '.')) == 0)
 	    p = outname + strlen(outname);
 	strcpy(p, ".h");