snapshot of project "lynx", label v2-8-3dev_4

12 files changed, 123 insertions, 55 deletions

diff --git a/src/chrtrans/README.format b/src/chrtrans/README.format
index df7d335e..7437b503 100644
--- a/src/chrtrans/README.format
+++ b/src/chrtrans/README.format
@@ -82,7 +82,7 @@ c) character translation definitions:
  *	<range>		idem
  *	<range>		<unicode range>
  *
- * where <range> ::= <fontpos>-<fontpos>
+ * where <unicode range> ::= <unicode>-<unicode>
  * and <unicode> ::= U+<h><h><h><h>
  * and <h> ::= <hexadecimal digit>
  *
diff --git a/src/chrtrans/UCkd.h b/src/chrtrans/UCkd.h
index 104882d7..a6020696 100644
--- a/src/chrtrans/UCkd.h
+++ b/src/chrtrans/UCkd.h
@@ -1,8 +1,5 @@
 #ifndef _UC_KD_H
 #define _UC_KD_H
-#ifdef NOTDEFINED
-#include <sys/types.h>	/* Included via tcp.h. */
-#endif /* NOTDEFINED */
 
 /*
  *  NOTE: THE FOLLOWING #define MAY NEED ADJUSTMENT.
diff --git a/src/chrtrans/jcuken_kb.h b/src/chrtrans/jcuken_kb.h
index 8fbe458b..75c8da96 100644
--- a/src/chrtrans/jcuken_kb.h
+++ b/src/chrtrans/jcuken_kb.h
@@ -1,4 +1,4 @@
-static unsigned short kb_layout_jcuken[128] = { 
+static LYKeymap_t kb_layout_jcuken[128] = { 
 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, /* 00..07 */ 
 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, /* 08..0F */ 
 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, /* 10..17 */ 
diff --git a/src/chrtrans/make-msc.bat b/src/chrtrans/make-msc.bat
new file mode 100644
index 00000000..7e69d642
--- /dev/null
+++ b/src/chrtrans/make-msc.bat
@@ -0,0 +1,49 @@
+@echo If .tbl files are added or removed you will need to hand edit

+@echo this batch file.

+@echo .

+@echo off

+REM make -f makefile.w32

+

+nmake -f makefile.msc

+

+makeuctb cp1250_uni.tbl > cp1250_uni.h

+makeuctb cp1251_uni.tbl > cp1251_uni.h

+makeuctb cp1252_uni.tbl > cp1252_uni.h

+makeuctb cp1253_uni.tbl > cp1253_uni.h

+makeuctb cp1255_uni.tbl > cp1255_uni.h

+makeuctb cp1256_uni.tbl > cp1256_uni.h

+makeuctb cp1257_uni.tbl > cp1257_uni.h

+makeuctb cp437_uni.tbl > cp437_uni.h

+makeuctb cp737_uni.tbl > cp737_uni.h

+makeuctb cp775_uni.tbl > cp775_uni.h

+makeuctb cp850_uni.tbl > cp850_uni.h

+makeuctb cp852_uni.tbl > cp852_uni.h

+makeuctb cp862_uni.tbl > cp862_uni.h

+makeuctb cp864_uni.tbl > cp864_uni.h

+makeuctb cp866_uni.tbl > cp866_uni.h

+makeuctb cp866u_uni.tbl > cp866u_uni.h

+makeuctb cp869_uni.tbl > cp869_uni.h

+makeuctb def7_uni.tbl  > def7_uni.h

+makeuctb dmcs_uni.tbl > dmcs_uni.h

+makeuctb hp_uni.tbl > hp_uni.h

+makeuctb iso01_uni.tbl > iso01_uni.h

+makeuctb iso02_uni.tbl > iso02_uni.h

+makeuctb iso03_uni.tbl > iso03_uni.h

+makeuctb iso04_uni.tbl > iso04_uni.h

+makeuctb iso05_uni.tbl > iso05_uni.h

+makeuctb iso06_uni.tbl > iso06_uni.h

+makeuctb iso07_uni.tbl > iso07_uni.h

+makeuctb iso08_uni.tbl > iso08_uni.h

+makeuctb iso09_uni.tbl > iso09_uni.h

+makeuctb iso10_uni.tbl > iso10_uni.h

+makeuctb iso15_uni.tbl > iso15_uni.h

+makeuctb koi8r_uni.tbl > koi8r_uni.h

+makeuctb koi8u_uni.tbl > koi8u_uni.h

+makeuctb mac_uni.tbl > mac_uni.h

+makeuctb mnem_suni.tbl > mnem_suni.h

+makeuctb mnem2_suni.tbl > mnem2_suni.h

+makeuctb mnem_suni.tbl > mnem_suni.h

+makeuctb next_uni.tbl > next_uni.h

+makeuctb rfc_suni.tbl > rfc_suni.h

+makeuctb utf8_uni.tbl > utf8_uni.h

+makeuctb viscii_uni.tbl > viscii_uni.h

diff --git a/src/chrtrans/makefile.dos b/src/chrtrans/makefile.dos
index 3a830a4f..cc9884cf 100644
--- a/src/chrtrans/makefile.dos
+++ b/src/chrtrans/makefile.dos
@@ -15,8 +15,8 @@ CC = gcc
 MCFLAGS = -O3 -DDOSPATH -DNO_TTYTYP \
 -I. \
 -I../../WWW/Library/Implementation \
--I../../djgpp/tcplib/include \
--I../../djgpp/tcplib/include/tcp \
+-I../../djgpp/watt32/inc \
+-I../../djgpp/watt32/inc/sys \
 -I../..
 
 .SUFFIXES: .tbl
diff --git a/src/chrtrans/makefile.in b/src/chrtrans/makefile.in
index 2e2f2681..87a39825 100644
--- a/src/chrtrans/makefile.in
+++ b/src/chrtrans/makefile.in
@@ -94,7 +94,7 @@ default: $(FONTMAP_INC)
 tables: $(TABLES)
 
 makeuctb$x: makeuctb.o
-	$(CC) $(CC_OPTS) -o $@ makeuctb.o $(INTLLIB) $(LIBS)
+	$(CC) $(CC_OPTS) $(LDFLAGS) -o $@ makeuctb.o $(INTLLIB) $(LIBS)
 
 makeuctb.o: $(srcdir)/UCkd.h $(srcdir)/makeuctb.c
 
diff --git a/src/chrtrans/makefile.msc b/src/chrtrans/makefile.msc
new file mode 100644
index 00000000..6885a616
--- /dev/null
+++ b/src/chrtrans/makefile.msc
@@ -0,0 +1,23 @@
+#
+# Makefile for Microsoft Visual C++ 4.2 or later
+#
+
+CC       = cl
+LD       = link
+
+INCLUDES = /I "." /I ".." /I "..\.." /I "..\..\WWW\Library\Implementation" /I "..\..\lib"
+DEFS = /D "NDEBUG" /D "__WIN32__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "NO_FILEIO_H" /D "NO_UNISTD_H" /D "_WINDOWS" /D "DOSPATH"
+CFLAGS   = /nologo /MT /W3 /GX /O2 /c
+
+LDFLAGS  = /nologo /subsystem:console /incremental:no /machine:I386
+LIBS     = user32.lib wsock32.lib
+
+COMPILE = $(CC) $(CFLAGS) $(INCLUDES) $(DEFS)
+LINK    = $(LD) $(LDFLAGS) /out:$@
+
+makeuctb.exe : makeuctb.obj
+	$(LINK) makeuctb.obj $(LIBS)
+
+makeuctb.obj :  makeuctb.c
+	$(COMPILE) makeuctb.c
+
diff --git a/src/chrtrans/MAKEFILE.W32 b/src/chrtrans/makefile.w32
index 4968995f..4968995f 100644
--- a/src/chrtrans/MAKEFILE.W32
+++ b/src/chrtrans/makefile.w32
diff --git a/src/chrtrans/makeuctb.c b/src/chrtrans/makeuctb.c
index 1207d3d1..7e6b18da 100644
--- a/src/chrtrans/makeuctb.c
+++ b/src/chrtrans/makeuctb.c
@@ -18,7 +18,6 @@
 
 #define DONT_USE_SOCKS5
 #include <HTUtils.h>
-#include <tcp.h>
 /*
  *  Don't try to use LYexit().
  */
diff --git a/src/chrtrans/MAKEW32.BAT b/src/chrtrans/makew32.bat
index 3ad8c16f..47b8ae69 100644
--- a/src/chrtrans/MAKEW32.BAT
+++ b/src/chrtrans/makew32.bat
@@ -1,44 +1,44 @@
-@echo If .tbl files are added or removed you will need to hand edit
-@echo this batch file.
-@echo .
-make -f makefile.w32
-makeuctb cp1250_uni.tbl > cp1250_uni.h
-makeuctb cp1251_uni.tbl > cp1251_uni.h
-makeuctb cp1252_uni.tbl > cp1252_uni.h
-makeuctb cp1253_uni.tbl > cp1253_uni.h
-makeuctb cp1255_uni.tbl > cp1255_uni.h
-makeuctb cp1256_uni.tbl > cp1256_uni.h
-makeuctb cp1257_uni.tbl > cp1257_uni.h
-makeuctb cp437_uni.tbl > cp437_uni.h
-makeuctb cp737_uni.tbl > cp737_uni.h
-makeuctb cp775_uni.tbl > cp775_uni.h
-makeuctb cp850_uni.tbl > cp850_uni.h
-makeuctb cp852_uni.tbl > cp852_uni.h
-makeuctb cp862_uni.tbl > cp862_uni.h
-makeuctb cp864_uni.tbl > cp864_uni.h
-makeuctb cp866_uni.tbl > cp866_uni.h
-makeuctb cp866u_uni.tbl > cp866u_uni.h
-makeuctb cp869_uni.tbl > cp869_uni.h
-makeuctb def7_uni.tbl  > def7_uni.h
-makeuctb dmcs_uni.tbl > dmcs_uni.h
-makeuctb hp_uni.tbl > hp_uni.h 
-makeuctb iso01_uni.tbl > iso01_uni.h
-makeuctb iso02_uni.tbl > iso02_uni.h
-makeuctb iso03_uni.tbl > iso03_uni.h
-makeuctb iso04_uni.tbl > iso04_uni.h
-makeuctb iso05_uni.tbl > iso05_uni.h
-makeuctb iso06_uni.tbl > iso06_uni.h
-makeuctb iso07_uni.tbl > iso07_uni.h
-makeuctb iso08_uni.tbl > iso08_uni.h
-makeuctb iso09_uni.tbl > iso09_uni.h
-makeuctb iso10_uni.tbl > iso10_uni.h
-makeuctb iso15_uni.tbl > iso15_uni.h 
-makeuctb koi8r_uni.tbl > koi8r_uni.h
-makeuctb koi8u_uni.tbl > koi8u_uni.h
-makeuctb mac_uni.tbl > mac_uni.h
-makeuctb mnem2_suni.tbl > mnem2_suni.h
-makeuctb mnem_suni.tbl > mnem_suni.h
-makeuctb next_uni.tbl > next_uni.h
-makeuctb rfc_suni.tbl > rfc_suni.h
-makeuctb utf8_uni.tbl > utf8_uni.h
-makeuctb viscii_uni.tbl > viscii_uni.h
+@echo If .tbl files are added or removed you will need to hand edit

+@echo this batch file.

+@echo .

+make -f makefile.w32

+makeuctb cp1250_uni.tbl > cp1250_uni.h

+makeuctb cp1251_uni.tbl > cp1251_uni.h

+makeuctb cp1252_uni.tbl > cp1252_uni.h

+makeuctb cp1253_uni.tbl > cp1253_uni.h

+makeuctb cp1255_uni.tbl > cp1255_uni.h

+makeuctb cp1256_uni.tbl > cp1256_uni.h

+makeuctb cp1257_uni.tbl > cp1257_uni.h

+makeuctb cp437_uni.tbl > cp437_uni.h

+makeuctb cp737_uni.tbl > cp737_uni.h

+makeuctb cp775_uni.tbl > cp775_uni.h

+makeuctb cp850_uni.tbl > cp850_uni.h

+makeuctb cp852_uni.tbl > cp852_uni.h

+makeuctb cp862_uni.tbl > cp862_uni.h

+makeuctb cp864_uni.tbl > cp864_uni.h

+makeuctb cp866_uni.tbl > cp866_uni.h

+makeuctb cp866u_uni.tbl > cp866u_uni.h

+makeuctb cp869_uni.tbl > cp869_uni.h

+makeuctb def7_uni.tbl  > def7_uni.h

+makeuctb dmcs_uni.tbl > dmcs_uni.h

+makeuctb hp_uni.tbl > hp_uni.h 

+makeuctb iso01_uni.tbl > iso01_uni.h

+makeuctb iso02_uni.tbl > iso02_uni.h

+makeuctb iso03_uni.tbl > iso03_uni.h

+makeuctb iso04_uni.tbl > iso04_uni.h

+makeuctb iso05_uni.tbl > iso05_uni.h

+makeuctb iso06_uni.tbl > iso06_uni.h

+makeuctb iso07_uni.tbl > iso07_uni.h

+makeuctb iso08_uni.tbl > iso08_uni.h

+makeuctb iso09_uni.tbl > iso09_uni.h

+makeuctb iso10_uni.tbl > iso10_uni.h

+makeuctb iso15_uni.tbl > iso15_uni.h 

+makeuctb koi8r_uni.tbl > koi8r_uni.h

+makeuctb koi8u_uni.tbl > koi8u_uni.h

+makeuctb mac_uni.tbl > mac_uni.h

+makeuctb mnem2_suni.tbl > mnem2_suni.h

+makeuctb mnem_suni.tbl > mnem_suni.h

+makeuctb next_uni.tbl > next_uni.h

+makeuctb rfc_suni.tbl > rfc_suni.h

+makeuctb utf8_uni.tbl > utf8_uni.h

+makeuctb viscii_uni.tbl > viscii_uni.h

diff --git a/src/chrtrans/rot13_kb.h b/src/chrtrans/rot13_kb.h
index 8bc1a9dc..41a6a870 100644
--- a/src/chrtrans/rot13_kb.h
+++ b/src/chrtrans/rot13_kb.h
@@ -1,4 +1,4 @@
-static unsigned short kb_layout_rot13[128] = { 
+static LYKeymap_t kb_layout_rot13[128] = { 
 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, /* 00..07 */ 
 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, /* 08..0F */ 
 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, /* 10..17 */ 
diff --git a/src/chrtrans/yawerty_kb.h b/src/chrtrans/yawerty_kb.h
index 2592b822..8698d965 100644
--- a/src/chrtrans/yawerty_kb.h
+++ b/src/chrtrans/yawerty_kb.h
@@ -1,4 +1,4 @@
-static unsigned short kb_layout_yawerty[128] = { 
+static LYKeymap_t kb_layout_yawerty[128] = { 
 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, /* 00..07 */ 
 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, /* 08..0F */ 
 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, /* 10..17 */