snapshot of project "lynx", label v2-7-1ac_0-28

6 files changed, 15 insertions, 5 deletions

diff --git a/src/chrtrans/MAKEW32.BAT b/src/chrtrans/MAKEW32.BAT
index 1259b344..3655ba0f 100644
--- a/src/chrtrans/MAKEW32.BAT
+++ b/src/chrtrans/MAKEW32.BAT
@@ -22,4 +22,3 @@ makeuctb rfc_suni.tbl > rfc_suni.h
 makeuctb def7_uni.tbl > def7_uni.h
 makeuctb koi8r_uni.tbl > koi8r_uni.h
 
-
diff --git a/src/chrtrans/Makefile b/src/chrtrans/Makefile
index 055dbad2..02f36f4f 100644
--- a/src/chrtrans/Makefile
+++ b/src/chrtrans/Makefile
@@ -54,12 +54,14 @@ makeuctb: makeuctb.c UCkd.h
 
 iso01_uni.h: iso01_uni.tbl makeuctb
 iso02_uni.h: iso02_uni.tbl makeuctb
+def7_uni.h: def7_uni.tbl makeuctb
 iso03_uni.h: iso03_uni.tbl makeuctb
 iso04_uni.h: iso04_uni.tbl makeuctb
 iso05_uni.h: iso05_uni.tbl makeuctb
 iso07_uni.h: iso07_uni.tbl makeuctb
 iso09_uni.h: iso09_uni.tbl makeuctb
 iso10_uni.h: iso10_uni.tbl makeuctb
+koi8r_uni.h: koi8r_uni.tbl makeuctb
 cp437_uni.h: cp437_uni.tbl makeuctb
 cp850_uni.h: cp850_uni.tbl makeuctb
 cp852_uni.h: cp852_uni.tbl makeuctb
diff --git a/src/chrtrans/README.tables b/src/chrtrans/README.tables
index 94622a99..c9a86605 100644
--- a/src/chrtrans/README.tables
+++ b/src/chrtrans/README.tables
@@ -45,8 +45,10 @@ if in doubt, check the last lines of the corresponding ...uni.h file.]
 c) To let make automatically notice when you have changed one of the
    table files, and automatically regenerate the *uni.h file(s), 
 you also have to add any new tables to both src/Makefile *and*
-src/chrtrans/Makefile.  (That may be inconvenient, but I didn't want to
-depend on features than not all makes may have.)  Note that for recompiling
-Lynx, a `make clean' should not be necessary if you have *only* made 
+src/chrtrans/Makefile.  Or, for auto-config, the equivalent files
+named makefile.in before running ./configure, or makefile after running
+./configure.  (That may be inconvenient, but I didn't want to depend
+on features than not all makes may have.)  Note that for recompiling
+Lynx, a `make clean' should not be necessary if you have *only* made
 changes to the files in src/chrtrans.
 
diff --git a/src/chrtrans/def7_uni.tbl b/src/chrtrans/def7_uni.tbl
index ab7fd4de..7978e73a 100644
--- a/src/chrtrans/def7_uni.tbl
+++ b/src/chrtrans/def7_uni.tbl
@@ -1230,7 +1230,7 @@ U+2020:/-
 U+2021:/=
 U+2022: o 
 U+2025:..
-U+2025:...
+U+2026:...
 
 # Dont wanna see these:
 # POP DIRECTIONAL FORMATTING      202C
diff --git a/src/chrtrans/makefile.in b/src/chrtrans/makefile.in
index 8d5da41f..246e94ba 100644
--- a/src/chrtrans/makefile.in
+++ b/src/chrtrans/makefile.in
@@ -76,12 +76,14 @@ makeuctb: makeuctb.c UCkd.h
 
 iso01_uni.h: iso01_uni.tbl makeuctb
 iso02_uni.h: iso02_uni.tbl makeuctb
+def7_uni.h: def7_uni.tbl makeuctb
 iso03_uni.h: iso03_uni.tbl makeuctb
 iso04_uni.h: iso04_uni.tbl makeuctb
 iso05_uni.h: iso05_uni.tbl makeuctb
 iso07_uni.h: iso07_uni.tbl makeuctb
 iso09_uni.h: iso09_uni.tbl makeuctb
 iso10_uni.h: iso10_uni.tbl makeuctb
+koi8r_uni.h: koi8r_uni.tbl makeuctb
 cp437_uni.h: cp437_uni.tbl makeuctb
 cp850_uni.h: cp850_uni.tbl makeuctb
 cp852_uni.h: cp852_uni.tbl makeuctb
diff --git a/src/chrtrans/makeuctb.c b/src/chrtrans/makeuctb.c
index aeb1a0e9..f5f73066 100644
--- a/src/chrtrans/makeuctb.c
+++ b/src/chrtrans/makeuctb.c
@@ -503,6 +503,11 @@ static u8 dfont_unicount%s[%d] = \n\
         printf(", ");
     }
 
+  /* If lowest_eightbit is anything else but 999, this can't be 7-bit
+   * only. */
+  if (lowest_eight != 999 && !RawUni)
+    RawUni = UCT_ENC_8BIT;
+
   if (nuni)
     printf("\nstatic u16 dfont_unitable%s[%d] = \n{\n\t", id_append, nuni);
   else