diff options
Diffstat (limited to 'src/chrtrans')
-rw-r--r-- | src/chrtrans/build-chrtrans.com | 1 | ||||
-rw-r--r-- | src/chrtrans/make-msc.bat | 1 | ||||
-rw-r--r-- | src/chrtrans/makefile.bcb | 8 | ||||
-rw-r--r-- | src/chrtrans/makefile.dos | 2 | ||||
-rw-r--r-- | src/chrtrans/makefile.in | 21 | ||||
-rw-r--r-- | src/chrtrans/makefile.msc | 2 | ||||
-rw-r--r-- | src/chrtrans/makeuctb.c | 21 | ||||
-rw-r--r-- | src/chrtrans/makew32.bat | 8 | ||||
-rw-r--r-- | src/chrtrans/pt154_uni.tbl | 174 |
9 files changed, 220 insertions, 18 deletions
diff --git a/src/chrtrans/build-chrtrans.com b/src/chrtrans/build-chrtrans.com index 0ba35058..ac8c932d 100644 --- a/src/chrtrans/build-chrtrans.com +++ b/src/chrtrans/build-chrtrans.com @@ -114,6 +114,7 @@ $ makeuctb mnem_suni.tbl $ makeuctb mnem2_suni.tbl $ makeuctb mnem_suni.tbl $ makeuctb next_uni.tbl +$ makeuctb pt154_uni.tbl $ makeuctb rfc_suni.tbl $ makeuctb utf8_uni.tbl $ makeuctb viscii_uni.tbl diff --git a/src/chrtrans/make-msc.bat b/src/chrtrans/make-msc.bat index e17389cb..7d7ca0f7 100644 --- a/src/chrtrans/make-msc.bat +++ b/src/chrtrans/make-msc.bat @@ -43,6 +43,7 @@ makeuctb mnem_suni.tbl makeuctb mnem2_suni.tbl makeuctb mnem_suni.tbl makeuctb next_uni.tbl +makeuctb pt154_uni.tbl makeuctb rfc_suni.tbl makeuctb utf8_uni.tbl makeuctb viscii_uni.tbl diff --git a/src/chrtrans/makefile.bcb b/src/chrtrans/makefile.bcb index 04b9585b..bc70b798 100644 --- a/src/chrtrans/makefile.bcb +++ b/src/chrtrans/makefile.bcb @@ -112,3 +112,11 @@ BccW32.cfg : -v- | $@ +clean : + -del *_uni.h + -del *.exe + -del *.map + -del *.obj + -del *.tds + -del BccW32.cfg + -del /f/s/q *.i diff --git a/src/chrtrans/makefile.dos b/src/chrtrans/makefile.dos index 03bb135d..1ee118c7 100644 --- a/src/chrtrans/makefile.dos +++ b/src/chrtrans/makefile.dos @@ -64,6 +64,7 @@ TABLES= \ mnem2_suni.h \ mnem_suni.h \ next_uni.h \ + pt154_uni.h \ rfc_suni.h \ utf8_uni.h \ viscii_uni.h @@ -116,6 +117,7 @@ mac_uni.h: mac_uni.tbl makeuctb.exe mnem2_suni.h: mnem2_suni.tbl makeuctb.exe mnem_suni.h: mnem_suni.tbl makeuctb.exe next_uni.h: next_uni.tbl makeuctb.exe +pt154_uni.h: pt154_uni.tbl makeuctb.exe rfc_suni.h: rfc_suni.tbl makeuctb.exe utf8_uni.h: utf8_uni.tbl makeuctb.exe viscii_uni.h: viscii_uni.tbl makeuctb.exe diff --git a/src/chrtrans/makefile.in b/src/chrtrans/makefile.in index d399a0e5..3db427e3 100644 --- a/src/chrtrans/makefile.in +++ b/src/chrtrans/makefile.in @@ -6,8 +6,6 @@ # SHELL = @CONFIG_SHELL@ -x = @PROG_EXT@ - prefix = @prefix@ exec_prefix = @exec_prefix@ top_srcdir = @top_srcdir@ @@ -29,7 +27,9 @@ SITE_DEFS = # FIXME: set in parent makefile CC = @CC@ CPP = @CPP@ CFLAGS = @CFLAGS@ -_O = .o + +x = @EXEEXT@ +o = .@OBJEXT@ CPP_OPTS = @DEFS@ @CPPFLAGS@ \ -I$(top_builddir) \ @@ -86,6 +86,8 @@ TABLES= \ mnem2_suni.h \ mnem_suni.h \ next_uni.h \ + next_uni.h \ + pt154_uni.h \ rfc_suni.h \ utf8_uni.h \ viscii_uni.h @@ -94,14 +96,14 @@ default: $(FONTMAP_INC) tables: $(TABLES) -makeuctb$x: makeuctb$(_O) - $(CC) $(CC_OPTS) $(LDFLAGS) -o $@ makeuctb$(_O) $(INTLLIB) $(LIBS) +makeuctb$x: makeuctb$o + $(CC) $(CC_OPTS) $(LDFLAGS) -o $@ makeuctb$o $(INTLLIB) $(LIBS) -makeuctb$(_O): $(srcdir)/UCkd.h $(srcdir)/makeuctb.c +makeuctb$o: $(srcdir)/UCkd.h $(srcdir)/makeuctb.c -.SUFFIXES : $(_O) .tbl .i +.SUFFIXES : $o .tbl .i -.c$(_O): +.c$o: @RULE_CC@ @ECHO_CC@$(CC) $(CC_OPTS) -c $(srcdir)/$*.c @@ -151,12 +153,13 @@ mac_uni.h: $(srcdir)/mac_uni.tbl makeuctb$x mnem2_suni.h: $(srcdir)/mnem2_suni.tbl makeuctb$x mnem_suni.h: $(srcdir)/mnem_suni.tbl makeuctb$x next_uni.h: $(srcdir)/next_uni.tbl makeuctb$x +pt154_uni.h: $(srcdir)/pt154_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$x *$(_O) *uni.h *uni2.h + rm -f makeuctb$x *$o *uni.h *uni2.h *.i distclean: clean -rm -rf obsolete diff --git a/src/chrtrans/makefile.msc b/src/chrtrans/makefile.msc index a57d93c4..228af43e 100644 --- a/src/chrtrans/makefile.msc +++ b/src/chrtrans/makefile.msc @@ -61,6 +61,7 @@ TABLES= \ mnem2_suni.h \ mnem_suni.h \ next_uni.h \ + pt154_uni.h \ rfc_suni.h \ utf8_uni.h \ viscii_uni.h @@ -115,6 +116,7 @@ mac_uni.h: mac_uni.tbl makeuctb.exe mnem2_suni.h: mnem2_suni.tbl makeuctb.exe mnem_suni.h: mnem_suni.tbl makeuctb.exe next_uni.h: next_uni.tbl makeuctb.exe +pt154_uni.h: pt154_uni.tbl makeuctb.exe rfc_suni.h: rfc_suni.tbl makeuctb.exe utf8_uni.h: utf8_uni.tbl makeuctb.exe viscii_uni.h: viscii_uni.tbl makeuctb.exe diff --git a/src/chrtrans/makeuctb.c b/src/chrtrans/makeuctb.c index 611e737d..04d05234 100644 --- a/src/chrtrans/makeuctb.c +++ b/src/chrtrans/makeuctb.c @@ -18,6 +18,7 @@ #define DONT_USE_SOCKS5 #include <HTUtils.h> + /* * Don't try to use LYexit(). */ @@ -25,14 +26,6 @@ #undef exit #endif /* exit */ -#ifndef TOUPPER -#define TOUPPER(c) (islower(UCH(c)) ? toupper(UCH(c)) : (c)) -#endif /* !TOLOWER */ - -#ifndef TOLOWER -#define TOLOWER(c) (isupper(UCH(c)) ? tolower(UCH(c)) : (c)) -#endif /* !TOLOWER */ - #include <UCkd.h> #include <UCDefs.h> @@ -79,6 +72,16 @@ PRIVATE void usage NOARGS done(EX_USAGE); } +#ifdef EXP_ASCII_CTYPES +PUBLIC int ascii_tolower ARGS1(int, i) +{ + if ( 91 > i && i > 64 ) + return (i+32); + else + return i; +} +#endif + /* copied from HTString.c, not everybody has strncasecmp */ PUBLIC int strncasecomp ARGS3( CONST char*, a, @@ -434,7 +437,7 @@ PUBLIC int main ARGS2( while (*p == ' ' || *p == '\t') { p++; } - useDefaultMap = (*p == '1' || tolower(*p) == 'y'); + useDefaultMap = (*p == '1' || TOLOWER(*p) == 'y'); continue; case 'M': diff --git a/src/chrtrans/makew32.bat b/src/chrtrans/makew32.bat index 6339101d..e03e1743 100644 --- a/src/chrtrans/makew32.bat +++ b/src/chrtrans/makew32.bat @@ -3,6 +3,11 @@ @echo . @echo off +if "%1"=="" goto normal +make -l -f makefile.bcb %1 +goto done + +:normal make -l -f makefile.bcb makeuctb cp1250_uni.tbl @@ -42,6 +47,9 @@ makeuctb mac_uni.tbl makeuctb mnem2_suni.tbl makeuctb mnem_suni.tbl makeuctb next_uni.tbl +makeuctb pt154_uni.tbl makeuctb rfc_suni.tbl makeuctb utf8_uni.tbl makeuctb viscii_uni.tbl + +:done diff --git a/src/chrtrans/pt154_uni.tbl b/src/chrtrans/pt154_uni.tbl new file mode 100644 index 00000000..a15c22e8 --- /dev/null +++ b/src/chrtrans/pt154_uni.tbl @@ -0,0 +1,174 @@ +Mptcp154 +# +OCyrillic-Asian (PT154) +# +C1540 + +##### +# +# Charset aliases: +# csPTCP154 +# PT154 +# CP154 +# Cyrillic-Asian +# +# Suitability for use in MIME text: +# Yes +# +# ISO 10646 equivalency table: +# Format: Three tab-separated columns +# Column #1 is the Paratype CP154 code (in hex) +# Column #2 is the Unicode (in hex as 0xXXXX) +# Column #3 is the Unicode name (follows a comment sign, '#') +# +# The entries are in Paratype CP154 order +# +##### + +0x20-0x7e idem +# +0x80 U+0496 # CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER +0x81 U+0492 # CYRILLIC CAPITAL LETTER GHE WITH STROKE +0x82 U+04EE # CYRILLIC CAPITAL LETTER U WITH MACRON +0x83 U+0493 # CYRILLIC SMALL LETTER GHE WITH STROKE +0x84 U+201E # DOUBLE LOW-9 QUOTATION MARK +0x85 U+2026 # HORIZONTAL ELLIPSIS +0x86 U+04B6 # CYRILLIC CAPITAL LETTER CHE WITH DESCENDER +0x87 U+04AE # CYRILLIC CAPITAL LETTER STRAIGHT U +0x88 U+04B2 # CYRILLIC CAPITAL LETTER HA WITH DESCENDER +0x89 U+04AF # CYRILLIC SMALL LETTER STRAIGHT U +0x8a U+04A0 # CYRILLIC CAPITAL LETTER BASHKIR KA +0x8b U+04E2 # CYRILLIC CAPITAL LETTER I WITH MACRON +0x8c U+04A2 # CYRILLIC CAPITAL LETTER EN WITH DESCENDER +0x8d U+049A # CYRILLIC CAPITAL LETTER KA WITH DESCENDER +0x8e U+04BA # CYRILLIC CAPITAL LETTER SHHA +0x8f U+04B8 # CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE +0x90 U+0497 # CYRILLIC SMALL LETTER ZHE WITH DESCENDER +0x91 U+2018 # LEFT SINGLE QUOTATION MARK +0x92 U+2019 # RIGHT SINGLE QUOTATION MARK +0x93 U+201C # LEFT DOUBLE QUOTATION MARK +0x94 U+201D # RIGHT DOUBLE QUOTATION MARK +0x95 U+2022 # BULLET +0x96 U+2013 # EN DASH +0x97 U+2014 # EM DASH +0x98 U+04B3 # CYRILLIC SMALL LETTER HA WITH DESCENDER +0x99 U+04B7 # CYRILLIC SMALL LETTER CHE WITH DESCENDER +0x9a U+04A1 # CYRILLIC SMALL LETTER BASHKIR KA +0x9b U+04E3 # CYRILLIC SMALL LETTER I WITH MACRON +0x9c U+04A3 # CYRILLIC SMALL LETTER EN WITH DESCENDER +0x9d U+049B # CYRILLIC SMALL LETTER KA WITH DESCENDER +0x9e U+04BB # CYRILLIC SMALL LETTER SHHA +0x9f U+04B9 # CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE +0xa0 U+00A0 # NO-BREAK SPACE +0xa1 U+040E # CYRILLIC CAPITAL LETTER SHORT U (Byelorussian) +0xa2 U+045E # CYRILLIC SMALL LETTER SHORT U (Byelorussian) +0xa3 U+0408 # CYRILLIC CAPITAL LETTER JE +0xa4 U+04E8 # CYRILLIC CAPITAL LETTER BARRED O +0xa5 U+0498 # CYRILLIC CAPITAL LETTER ZE WITH DESCENDER +0xa6 U+04B0 # CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE +0xa7 U+00A7 # SECTION SIGN +0xa8 U+0401 # CYRILLIC CAPITAL LETTER IO +0xa9 U+00A9 # COPYRIGHT SIGN +0xaa U+04D8 # CYRILLIC CAPITAL LETTER SCHWA +0xab U+00AB # LEFT-POINTING DOUBLE ANGLE QUOTATION MARK +0xac U+00AC # NOT SIGN +0xad U+04EF # CYRILLIC SMALL LETTER U WITH MACRON +0xae U+00AE # REGISTERED SIGN +0xaf U+049C # CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE +0xb0 U+00B0 # DEGREE SIGN +0xb1 U+04B1 # CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE +0xb2 U+0406 # CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I +0xb3 U+0456 # CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I +0xb4 U+0499 # CYRILLIC SMALL LETTER ZE WITH DESCENDER +0xb5 U+04E9 # CYRILLIC SMALL LETTER BARRED O +0xb6 U+00B6 # PILCROW SIGN +0xb7 U+00B7 # MIDDLE DOT +0xb8 U+0451 # CYRILLIC SMALL LETTER IO +0xb9 U+2116 # NUMERO SIGN +0xba U+04D9 # CYRILLIC SMALL LETTER SCHWA +0xbb U+00BB # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK +0xbc U+0458 # CYRILLIC SMALL LETTER JE +0xbd U+04AA # CYRILLIC CAPITAL LETTER ES WITH DESCENDER +0xbe U+04AB # CYRILLIC SMALL LETTER ES WITH DESCENDER +0xbf U+049D # CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE +0xc0 U+0410 # CYRILLIC CAPITAL LETTER A +0xc1 U+0411 # CYRILLIC CAPITAL LETTER BE +0xc2 U+0412 # CYRILLIC CAPITAL LETTER VE +0xc3 U+0413 # CYRILLIC CAPITAL LETTER GHE +0xc4 U+0414 # CYRILLIC CAPITAL LETTER DE +0xc5 U+0415 # CYRILLIC CAPITAL LETTER IE +0xc6 U+0416 # CYRILLIC CAPITAL LETTER ZHE +0xc7 U+0417 # CYRILLIC CAPITAL LETTER ZE +0xc8 U+0418 # CYRILLIC CAPITAL LETTER I +0xc9 U+0419 # CYRILLIC CAPITAL LETTER SHORT I +0xca U+041A # CYRILLIC CAPITAL LETTER KA +0xcb U+041B # CYRILLIC CAPITAL LETTER EL +0xcc U+041C # CYRILLIC CAPITAL LETTER EM +0xcd U+041D # CYRILLIC CAPITAL LETTER EN +0xce U+041E # CYRILLIC CAPITAL LETTER O +0xcf U+041F # CYRILLIC CAPITAL LETTER PE +0xd0 U+0420 # CYRILLIC CAPITAL LETTER ER +0xd1 U+0421 # CYRILLIC CAPITAL LETTER ES +0xd2 U+0422 # CYRILLIC CAPITAL LETTER TE +0xd3 U+0423 # CYRILLIC CAPITAL LETTER U +0xd4 U+0424 # CYRILLIC CAPITAL LETTER EF +0xd5 U+0425 # CYRILLIC CAPITAL LETTER HA +0xd6 U+0426 # CYRILLIC CAPITAL LETTER TSE +0xd7 U+0427 # CYRILLIC CAPITAL LETTER CHE +0xd8 U+0428 # CYRILLIC CAPITAL LETTER SHA +0xd9 U+0429 # CYRILLIC CAPITAL LETTER SHCHA +0xda U+042A # CYRILLIC CAPITAL LETTER HARD SIGN +0xdb U+042B # CYRILLIC CAPITAL LETTER YERU +0xdc U+042C # CYRILLIC CAPITAL LETTER SOFT SIGN +0xdd U+042D # CYRILLIC CAPITAL LETTER E +0xde U+042E # CYRILLIC CAPITAL LETTER YU +0xdf U+042F # CYRILLIC CAPITAL LETTER YA +0xe0 U+0430 # CYRILLIC SMALL LETTER A +0xe1 U+0431 # CYRILLIC SMALL LETTER BE +0xe2 U+0432 # CYRILLIC SMALL LETTER VE +0xe3 U+0433 # CYRILLIC SMALL LETTER GHE +0xe4 U+0434 # CYRILLIC SMALL LETTER DE +0xe5 U+0435 # CYRILLIC SMALL LETTER IE +0xe6 U+0436 # CYRILLIC SMALL LETTER ZHE +0xe7 U+0437 # CYRILLIC SMALL LETTER ZE +0xe8 U+0438 # CYRILLIC SMALL LETTER I +0xe9 U+0439 # CYRILLIC SMALL LETTER SHORT I +0xea U+043A # CYRILLIC SMALL LETTER KA +0xeb U+043B # CYRILLIC SMALL LETTER EL +0xec U+043C # CYRILLIC SMALL LETTER EM +0xed U+043D # CYRILLIC SMALL LETTER EN +0xee U+043E # CYRILLIC SMALL LETTER O +0xef U+043F # CYRILLIC SMALL LETTER PE +0xf0 U+0440 # CYRILLIC SMALL LETTER ER +0xf1 U+0441 # CYRILLIC SMALL LETTER ES +0xf2 U+0442 # CYRILLIC SMALL LETTER TE +0xf3 U+0443 # CYRILLIC SMALL LETTER U +0xf4 U+0444 # CYRILLIC SMALL LETTER EF +0xf5 U+0445 # CYRILLIC SMALL LETTER HA +0xf6 U+0446 # CYRILLIC SMALL LETTER TSE +0xf7 U+0447 # CYRILLIC SMALL LETTER CHE +0xf8 U+0448 # CYRILLIC SMALL LETTER SHA +0xf9 U+0449 # CYRILLIC SMALL LETTER SHCHA +0xfa U+044A # CYRILLIC SMALL LETTER HARD SIGN +0xfb U+044B # CYRILLIC SMALL LETTER YERU +0xfc U+044C # CYRILLIC SMALL LETTER SOFT SIGN +0xfd U+044D # CYRILLIC SMALL LETTER E +0xfe U+044E # CYRILLIC SMALL LETTER YU +0xff U+044F # CYRILLIC SMALL LETTER YA + +##### +# +# Additional information: +# This charset based on CP1251 with added asian cyrillic symbols. +# +# Person & email address to contact for further information: +# Alexander Uskov +# InternetDataCenter of KazakhTelecom. +# e-mail: auskov@idc.kz +# +# Intended usage: +# COMMON +# +# (record created 2002-09-27) +# +##### |