diff options
Diffstat (limited to 'src/chrtrans')
| -rw-r--r-- | src/chrtrans/README.tables | 2 | ||||
| -rw-r--r-- | src/chrtrans/UCkd.h | 1 | ||||
| -rw-r--r-- | src/chrtrans/cp1252_uni.tbl | 80 | ||||
| -rw-r--r-- | src/chrtrans/def7_uni.tbl | 7 | ||||
| -rw-r--r-- | src/chrtrans/makefile.in | 81 | ||||
| -rw-r--r-- | src/chrtrans/makeuctb.c | 2 |
6 files changed, 88 insertions, 85 deletions
diff --git a/src/chrtrans/README.tables b/src/chrtrans/README.tables index e2815707..be6dac6a 100644 --- a/src/chrtrans/README.tables +++ b/src/chrtrans/README.tables @@ -6,7 +6,7 @@ for some of the RFC 1345 Mnemonic codes are out of date, a cleanup and update would be needed for serious use. More translation files can be easily provided (and new character entities -added to HTMLDTD.c), this set is just to test whether the system works +added to entities.h), this set is just to test whether the system works in principle (and also how it behaves with incomplete data...) See the file README.format for a brief explanation of what's in the diff --git a/src/chrtrans/UCkd.h b/src/chrtrans/UCkd.h index 1497f298..1e55716e 100644 --- a/src/chrtrans/UCkd.h +++ b/src/chrtrans/UCkd.h @@ -56,6 +56,7 @@ struct unimapdesc_str { #define UC_MAXLEN_LYNXCSNAME 40 #define UC_LEN_LYNXCSNAME 20 +#undef EX_OK /* may be defined in system headers */ #define EX_OK 0 /* successful termination */ #define EX_USAGE 64 /* command line usage error */ #define EX_DATAERR 65 /* data format error */ diff --git a/src/chrtrans/cp1252_uni.tbl b/src/chrtrans/cp1252_uni.tbl index d1ce324d..d8adb2fa 100644 --- a/src/chrtrans/cp1252_uni.tbl +++ b/src/chrtrans/cp1252_uni.tbl @@ -25,38 +25,38 @@ OWinLatin1 (cp1252) # # The entries are in cp1252_WinLatin1 order # -0x00 U+0000 #Null -0x01 U+0001 #START OF HEADING -0x02 U+0002 #START OF TEXT -0x03 U+0003 #END OF TEXT -0x04 U+0004 #END OF TRANSMISSION -0x05 U+0005 #ENQUIRY -0x06 U+0006 #ACKNOWLEDGE -0x07 U+0007 #BELL -0x08 U+0008 #BACKSPACE -0x09 U+0009 #HORIZONTAL TABULATION -0x0a U+000a #LINE FEED -0x0b U+000b #VERTICAL TABULATION -0x0c U+000c #FORM FEED -0x0d U+000d #CARRIAGE RETURN -0x0e U+000e #SHIFT OUT -0x0f U+000f #SHIFT IN -0x10 U+0010 #DATA LINK ESCAPE -0x11 U+0011 #DEVICE CONTROL ONE -0x12 U+0012 #DEVICE CONTROL TWO -0x13 U+0013 #DEVICE CONTROL THREE -0x14 U+0014 #DEVICE CONTROL FOUR -0x15 U+0015 #NEGATIVE ACKNOWLEDGE -0x16 U+0016 #SYNCHRONOUS IDLE -0x17 U+0017 #END OF TRANSMISSION BLOCK -0x18 U+0018 #CANCEL -0x19 U+0019 #END OF MEDIUM -0x1a U+001a #SUBSTITUTE -0x1b U+001b #ESCAPE -0x1c U+001c #FILE SEPARATOR -0x1d U+001d #GROUP SEPARATOR -0x1e U+001e #RECORD SEPARATOR -0x1f U+001f #UNIT SEPARATOR +#0x00 U+0000 #Null +#0x01 U+0001 #START OF HEADING +#0x02 U+0002 #START OF TEXT +#0x03 U+0003 #END OF TEXT +#0x04 U+0004 #END OF TRANSMISSION +#0x05 U+0005 #ENQUIRY +#0x06 U+0006 #ACKNOWLEDGE +#0x07 U+0007 #BELL +#0x08 U+0008 #BACKSPACE +#0x09 U+0009 #HORIZONTAL TABULATION +#0x0a U+000a #LINE FEED +#0x0b U+000b #VERTICAL TABULATION +#0x0c U+000c #FORM FEED +#0x0d U+000d #CARRIAGE RETURN +#0x0e U+000e #SHIFT OUT +#0x0f U+000f #SHIFT IN +#0x10 U+0010 #DATA LINK ESCAPE +#0x11 U+0011 #DEVICE CONTROL ONE +#0x12 U+0012 #DEVICE CONTROL TWO +#0x13 U+0013 #DEVICE CONTROL THREE +#0x14 U+0014 #DEVICE CONTROL FOUR +#0x15 U+0015 #NEGATIVE ACKNOWLEDGE +#0x16 U+0016 #SYNCHRONOUS IDLE +#0x17 U+0017 #END OF TRANSMISSION BLOCK +#0x18 U+0018 #CANCEL +#0x19 U+0019 #END OF MEDIUM +#0x1a U+001a #SUBSTITUTE +#0x1b U+001b #ESCAPE +#0x1c U+001c #FILE SEPARATOR +#0x1d U+001d #GROUP SEPARATOR +#0x1e U+001e #RECORD SEPARATOR +#0x1f U+001f #UNIT SEPARATOR 0x20 U+0020 #SPACE 0x21 U+0021 #EXCLAMATION MARK 0x22 U+0022 #QUOTATION MARK @@ -153,8 +153,8 @@ OWinLatin1 (cp1252) 0x7d U+007d #RIGHT CURLY BRACKET 0x7e U+007e #TILDE 0x7f U+007f #DELETE -# 0x80 U+0080 #NOT USED -# 0x81 U+0081 #NOT USED +#0x80 U+0080 #NOT USED +#0x81 U+0081 #NOT USED 0x82 U+201a #SINGLE LOW-9 QUOTATION MARK 0x83 U+0192 #LATIN SMALL LETTER F WITH HOOK 0x84 U+201e #DOUBLE LOW-9 QUOTATION MARK @@ -166,10 +166,10 @@ OWinLatin1 (cp1252) 0x8a U+0160 #LATIN CAPITAL LETTER S WITH CARON 0x8b U+2039 #SINGLE LEFT-POINTING ANGLE QUOTATION MARK 0x8c U+0152 #LATIN CAPITAL LIGATURE OE -0x8d U+008d #NOT USED -0x8e U+008e #NOT USED -0x8f U+008f #NOT USED -0x90 U+0090 #NOT USED +#0x8d U+008d #NOT USED +#0x8e U+008e #NOT USED +#0x8f U+008f #NOT USED +#0x90 U+0090 #NOT USED 0x91 U+2018 #LEFT SINGLE QUOTATION MARK 0x92 U+2019 #RIGHT SINGLE QUOTATION MARK 0x93 U+201c #LEFT DOUBLE QUOTATION MARK @@ -182,8 +182,8 @@ OWinLatin1 (cp1252) 0x9a U+0161 #LATIN SMALL LETTER S WITH CARON 0x9b U+203a #SINGLE RIGHT-POINTING ANGLE QUOTATION MARK 0x9c U+0153 #LATIN SMALL LIGATURE OE -0x9d U+009d #NOT USED -0x9e U+009e #NOT USED +#0x9d U+009d #NOT USED +#0x9e U+009e #NOT USED 0x9f U+0178 #LATIN CAPITAL LETTER Y WITH DIAERESIS 0xa0 U+00a0 #NO-BREAK SPACE 0xa1 U+00a1 #INVERTED EXCLAMATION MARK diff --git a/src/chrtrans/def7_uni.tbl b/src/chrtrans/def7_uni.tbl index 880e932e..0c86d234 100644 --- a/src/chrtrans/def7_uni.tbl +++ b/src/chrtrans/def7_uni.tbl @@ -2168,9 +2168,10 @@ U+001f:US U+007f:DT U+0080:PA U+0081:HO -# most of this characters (82-9F) may be switched ON in the code -# as windows-1252 if come silently (HTTP default is iso-latin-1, -# but windows-1252 is superset of iso-latin-1) +# Most of these characters (82-9F) may be inflicted on us +# by MS FrontPages which uses Unicode notation such as ™ +# but there are no assigned letters in Unicode 128-159 range. +# It is assumed in the code that those codepoints are from windows-1252. #U+0082:BH #U+0083:NH #U+0084:IN diff --git a/src/chrtrans/makefile.in b/src/chrtrans/makefile.in index 0a64fd44..c778a324 100644 --- a/src/chrtrans/makefile.in +++ b/src/chrtrans/makefile.in @@ -4,8 +4,9 @@ # This may not yet work for the general case. # Only some dependencies included. # -# -SHELL = /bin/sh +SHELL = /bin/sh + +x = @PROG_EXT@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -76,8 +77,8 @@ default: $(FONTMAP_INC) tables: $(TABLES) -makeuctb: makeuctb.o - $(CC) $(CC_OPTS) -o makeuctb makeuctb.o +makeuctb$x: makeuctb.o + $(CC) $(CC_OPTS) -o $@ makeuctb.o makeuctb.o: $(srcdir)/UCkd.h $(srcdir)/makeuctb.c @@ -96,44 +97,44 @@ makeuctb.o: $(srcdir)/UCkd.h $(srcdir)/makeuctb.c # table files listed here once again to get the make dependencies # right, in case makeuctb was recompiled. -cp1250_uni.h: $(srcdir)/cp1250_uni.tbl makeuctb -cp1251_uni.h: $(srcdir)/cp1251_uni.tbl makeuctb -cp1252_uni.h: $(srcdir)/cp1252_uni.tbl makeuctb -cp1253_uni.h: $(srcdir)/cp1253_uni.tbl makeuctb -cp1255_uni.h: $(srcdir)/cp1255_uni.tbl makeuctb -cp1256_uni.h: $(srcdir)/cp1256_uni.tbl makeuctb -cp1257_uni.h: $(srcdir)/cp1257_uni.tbl makeuctb -cp437_uni.h: $(srcdir)/cp437_uni.tbl makeuctb -cp737_uni.h: $(srcdir)/cp737_uni.tbl makeuctb -cp850_uni.h: $(srcdir)/cp850_uni.tbl makeuctb -cp852_uni.h: $(srcdir)/cp852_uni.tbl makeuctb -cp862_uni.h: $(srcdir)/cp862_uni.tbl makeuctb -cp864_uni.h: $(srcdir)/cp864_uni.tbl makeuctb -cp866_uni.h: $(srcdir)/cp866_uni.tbl makeuctb -cp869_uni.h: $(srcdir)/cp869_uni.tbl makeuctb -def7_uni.h: $(srcdir)/def7_uni.tbl makeuctb -dmcs_uni.h: $(srcdir)/dmcs_uni.tbl makeuctb -iso01_uni.h: $(srcdir)/iso01_uni.tbl makeuctb -iso02_uni.h: $(srcdir)/iso02_uni.tbl makeuctb -iso03_uni.h: $(srcdir)/iso03_uni.tbl makeuctb -iso04_uni.h: $(srcdir)/iso04_uni.tbl makeuctb -iso05_uni.h: $(srcdir)/iso05_uni.tbl makeuctb -iso06_uni.h: $(srcdir)/iso06_uni.tbl makeuctb -iso07_uni.h: $(srcdir)/iso07_uni.tbl makeuctb -iso08_uni.h: $(srcdir)/iso08_uni.tbl makeuctb -iso09_uni.h: $(srcdir)/iso09_uni.tbl makeuctb -iso10_uni.h: $(srcdir)/iso10_uni.tbl makeuctb -koi8r_uni.h: $(srcdir)/koi8r_uni.tbl makeuctb -mac_uni.h: $(srcdir)/mac_uni.tbl makeuctb -mnem_suni.h: $(srcdir)/mnem_suni.tbl makeuctb -mnem2_suni.h: $(srcdir)/mnem2_suni.tbl makeuctb -next_uni.h: $(srcdir)/next_uni.tbl makeuctb -rfc_suni.h: $(srcdir)/rfc_suni.tbl makeuctb -utf8_uni.h: $(srcdir)/utf8_uni.tbl makeuctb -viscii_uni.h: $(srcdir)/viscii_uni.tbl makeuctb +cp1250_uni.h: $(srcdir)/cp1250_uni.tbl makeuctb$x +cp1251_uni.h: $(srcdir)/cp1251_uni.tbl makeuctb$x +cp1252_uni.h: $(srcdir)/cp1252_uni.tbl makeuctb$x +cp1253_uni.h: $(srcdir)/cp1253_uni.tbl makeuctb$x +cp1255_uni.h: $(srcdir)/cp1255_uni.tbl makeuctb$x +cp1256_uni.h: $(srcdir)/cp1256_uni.tbl makeuctb$x +cp1257_uni.h: $(srcdir)/cp1257_uni.tbl makeuctb$x +cp437_uni.h: $(srcdir)/cp437_uni.tbl makeuctb$x +cp737_uni.h: $(srcdir)/cp737_uni.tbl makeuctb$x +cp850_uni.h: $(srcdir)/cp850_uni.tbl makeuctb$x +cp852_uni.h: $(srcdir)/cp852_uni.tbl makeuctb$x +cp862_uni.h: $(srcdir)/cp862_uni.tbl makeuctb$x +cp864_uni.h: $(srcdir)/cp864_uni.tbl makeuctb$x +cp866_uni.h: $(srcdir)/cp866_uni.tbl makeuctb$x +cp869_uni.h: $(srcdir)/cp869_uni.tbl makeuctb$x +def7_uni.h: $(srcdir)/def7_uni.tbl makeuctb$x +dmcs_uni.h: $(srcdir)/dmcs_uni.tbl makeuctb$x +iso01_uni.h: $(srcdir)/iso01_uni.tbl makeuctb$x +iso02_uni.h: $(srcdir)/iso02_uni.tbl makeuctb$x +iso03_uni.h: $(srcdir)/iso03_uni.tbl makeuctb$x +iso04_uni.h: $(srcdir)/iso04_uni.tbl makeuctb$x +iso05_uni.h: $(srcdir)/iso05_uni.tbl makeuctb$x +iso06_uni.h: $(srcdir)/iso06_uni.tbl makeuctb$x +iso07_uni.h: $(srcdir)/iso07_uni.tbl makeuctb$x +iso08_uni.h: $(srcdir)/iso08_uni.tbl makeuctb$x +iso09_uni.h: $(srcdir)/iso09_uni.tbl makeuctb$x +iso10_uni.h: $(srcdir)/iso10_uni.tbl makeuctb$x +koi8r_uni.h: $(srcdir)/koi8r_uni.tbl makeuctb$x +mac_uni.h: $(srcdir)/mac_uni.tbl makeuctb$x +mnem_suni.h: $(srcdir)/mnem_suni.tbl makeuctb$x +mnem2_suni.h: $(srcdir)/mnem2_suni.tbl makeuctb$x +next_uni.h: $(srcdir)/next_uni.tbl makeuctb$x +rfc_suni.h: $(srcdir)/rfc_suni.tbl makeuctb$x +utf8_uni.h: $(srcdir)/utf8_uni.tbl makeuctb$x +viscii_uni.h: $(srcdir)/viscii_uni.tbl makeuctb$x clean: - rm -f makeuctb *.o *uni.h *uni2.h + rm -f makeuctb$x *.o *uni.h *uni2.h distclean: clean -rm -rf obsolete diff --git a/src/chrtrans/makeuctb.c b/src/chrtrans/makeuctb.c index f1417cb7..3e0c81c5 100644 --- a/src/chrtrans/makeuctb.c +++ b/src/chrtrans/makeuctb.c @@ -60,7 +60,7 @@ PRIVATE void usage ARGS1( } /* copied from HTString.c, not everybody has strncasecmp */ -PUBLIC int strncasecomp ARGS3( +PRIVATE int strncasecomp ARGS3( CONST char*, a, CONST char *, b, int, n) |