Module Name: src
Committed By: mbalmer
Date: Wed Apr 27 20:05:57 UTC 2011
Modified Files:
src/etc/mtree: NetBSD.dist.base
src/share/i18n/csmapper: Makefile
src/share/i18n/esdb: Makefile
Added Files:
src/share/i18n/csmapper/CBM: CBMINT%UCS.src Makefile.inc UCS%CBMINT.src
charset.pivot.CBM.src mapper.dir.CBM.src
src/share/i18n/esdb/CBM: CBMINT.src Makefile.inc esdb.alias.CBM.src
esdb.dir.CBM.src
Log Message:
Add Japan CBM character codes.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.13 -r1.14 src/share/i18n/csmapper/Makefile
cvs rdiff -u -r0 -r1.1 src/share/i18n/csmapper/CBM/CBMINT%UCS.src \
src/share/i18n/csmapper/CBM/Makefile.inc \
src/share/i18n/csmapper/CBM/UCS%CBMINT.src \
src/share/i18n/csmapper/CBM/charset.pivot.CBM.src \
src/share/i18n/csmapper/CBM/mapper.dir.CBM.src
cvs rdiff -u -r1.14 -r1.15 src/share/i18n/esdb/Makefile
cvs rdiff -u -r0 -r1.1 src/share/i18n/esdb/CBM/CBMINT.src \
src/share/i18n/esdb/CBM/Makefile.inc \
src/share/i18n/esdb/CBM/esdb.alias.CBM.src \
src/share/i18n/esdb/CBM/esdb.dir.CBM.src
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.86 src/etc/mtree/NetBSD.dist.base:1.87
--- src/etc/mtree/NetBSD.dist.base:1.86 Thu Apr 21 14:26:34 2011
+++ src/etc/mtree/NetBSD.dist.base Wed Apr 27 20:05:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.86 2011/04/21 14:26:34 joerg Exp $
+# $NetBSD: NetBSD.dist.base,v 1.87 2011/04/27 20:05:56 mbalmer Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -376,6 +376,7 @@
./usr/share/i18n/csmapper/APPLE
./usr/share/i18n/csmapper/AST
./usr/share/i18n/csmapper/BIG5
+./usr/share/i18n/csmapper/CBM
./usr/share/i18n/csmapper/CNS
./usr/share/i18n/csmapper/CP
./usr/share/i18n/csmapper/EBCDIC
@@ -393,6 +394,7 @@
./usr/share/i18n/esdb/APPLE
./usr/share/i18n/esdb/AST
./usr/share/i18n/esdb/BIG5
+./usr/share/i18n/esdb/CBM
./usr/share/i18n/esdb/CP
./usr/share/i18n/esdb/DEC
./usr/share/i18n/esdb/EBCDIC
Index: src/share/i18n/csmapper/Makefile
diff -u src/share/i18n/csmapper/Makefile:1.13 src/share/i18n/csmapper/Makefile:1.14
--- src/share/i18n/csmapper/Makefile:1.13 Tue Mar 13 16:34:37 2007
+++ src/share/i18n/csmapper/Makefile Wed Apr 27 20:05:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/03/13 16:34:37 tnozaki Exp $
+# $NetBSD: Makefile,v 1.14 2011/04/27 20:05:56 mbalmer Exp $
NOMAN=
@@ -10,7 +10,7 @@
SRCS_mapper.dir+= mapper.dir.src
SRCS_charset.pivot+= charset.pivot.src
-SUBDIR= APPLE AST BIG5 CNS CP EBCDIC GB GEORGIAN ISO646 ISO-8859 \
+SUBDIR= APPLE AST BIG5 CBM CNS CP EBCDIC GB GEORGIAN ISO646 ISO-8859 \
JIS KAZAKH KOI KS MISC TCVN
.for i in ${SUBDIR}
.if exists(${.CURDIR}/$i/Makefile.inc)
Index: src/share/i18n/esdb/Makefile
diff -u src/share/i18n/esdb/Makefile:1.14 src/share/i18n/esdb/Makefile:1.15
--- src/share/i18n/esdb/Makefile:1.14 Sun Apr 1 18:52:30 2007
+++ src/share/i18n/esdb/Makefile Wed Apr 27 20:05:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/04/01 18:52:30 tnozaki Exp $
+# $NetBSD: Makefile,v 1.15 2011/04/27 20:05:56 mbalmer Exp $
NOMAN=
@@ -12,7 +12,7 @@
${_MKTARGET_CREATE}
${TOOL_MKESDB} -o $@ $>
-SUBDIR= APPLE AST BIG5 CP DEC EUC EBCDIC GB GEORGIAN ISO-2022 \
+SUBDIR= APPLE AST BIG5 CBM CP DEC EUC EBCDIC GB GEORGIAN ISO-2022 \
ISO-8859 ISO646 KAZAKH KOI MISC TCVN UTF
.for i in ${SUBDIR}
Added files:
Index: src/share/i18n/csmapper/CBM/CBMINT%UCS.src
diff -u /dev/null src/share/i18n/csmapper/CBM/CBMINT%UCS.src:1.1
--- /dev/null Wed Apr 27 20:05:57 2011
+++ src/share/i18n/csmapper/CBM/CBMINT%UCS.src Wed Apr 27 20:05:56 2011
@@ -0,0 +1,90 @@
+# $NetBSD: CBMINT%UCS.src,v 1.1 2011/04/27 20:05:56 mbalmer Exp $
+
+TYPE ROWCOL
+NAME "CBMINT/UCS"
+SRC_ZONE 0x00-0xFF
+OOB_MODE ILSEQ
+DST_ILSEQ 0xFFFE
+DST_UNIT_BITS 16
+
+BEGIN_MAP
+#
+# This mapping data is made from data provided by Japan CBM Corporation,
+# Information Systems Div.
+# Original notice:
+#
+# Name: CBM Internatinal Character Codes to Unicode table
+# Unicode version: 2.0
+# Table version: 2.00
+# Table format: Format A
+# Date: 04/27/2011
+# Authors: Marc Balmer <m...@msys.ch>
+# General notes: none
+#
+# Format: Three tab-separated columns
+# Column #1 is the CBMINT 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 CBMINT order
+#
+0x00 - 0x7F = 0x0000 -
+0xA0 = 0x00A3
+0xA1 = 0x2103
+0xA2 = 0x2109
+0xA3 = 0x03A9
+0xA4 = 0x00B5
+0xA5 = 0x03A3
+0xA6 = 0x03C3
+0xA8 = 0x00A2
+0xA9 = 0x00D7
+0xAA = 0x221E
+0xAB = 0x00B1
+0xAC = 0x00F7
+0xAD = 0x03C0
+0xAE = 0x00C4
+0xAF = 0x00D6
+0xB0 = 0x00DC
+0xB1 = 0x03B2
+0xB2 = 0x00A7
+0xB3 = 0x0020
+0xB4 = 0x00BA
+0xB5 = 0x00B0
+0xB7 = 0x00BD
+0xBB = 0x00BC
+0xBC = 0x00C3
+0xBD = 0x00EB
+0xBE = 0x00E9
+0xBF = 0x00E8
+0xC0 = 0x0113
+0xC1 = 0x00EA
+0xC2 = 0x00EF
+0xC3 = 0x00ED
+0xC4 = 0x00EC
+0xC5 = 0x012B
+0xC6 = 0x00EE
+0xC7 = 0x00F6
+0xC8 = 0x00F3
+0xC9 = 0x00F2
+0xCA = 0x00F5
+0xCB = 0x00F4
+0xCC = 0x00FC
+0xCD = 0x00FA
+0xCE = 0x00F9
+0xCF = 0x016B
+0xD0 = 0x00FB
+0xD1 = 0x00E7
+0xD2 = 0x00BF
+0xD3 = 0x00D1
+0xD4 = 0x00F1
+0xD5 = 0x0112
+0xD7 = 0x00A1
+0xD8 = 0x00C5
+0xD9 = 0x03D5
+0xDA = 0x03B8
+0xDB = 0x00E4
+0xDC = 0x00E1
+0xDD = 0x00E0
+0xDE = 0x00E3
+0xDF = 0x00E2
+END_MAP
Index: src/share/i18n/csmapper/CBM/Makefile.inc
diff -u /dev/null src/share/i18n/csmapper/CBM/Makefile.inc:1.1
--- /dev/null Wed Apr 27 20:05:57 2011
+++ src/share/i18n/csmapper/CBM/Makefile.inc Wed Apr 27 20:05:56 2011
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile.inc,v 1.1 2011/04/27 20:05:56 mbalmer Exp $
+
+.PATH: ${.CURDIR}/CBM
+
+SRCS_mapper.dir+= mapper.dir.CBM
+SRCS_charset.pivot+= charset.pivot.CBM
+CLEANFILES+= mapper.dir.CBM charset.pivot.CBM
+MAPS_CBM= CBMINT%UCS.mps \
+ UCS%CBMINT.mps
+
+mapper.dir.CBM: ${.CURDIR}/CBM/mapper.dir.CBM.src
+ ${_MKTARGET_CREATE}
+ (echo "# CBM" ; cat ${.ALLSRC} ; echo ) > ${.TARGET}
+
+charset.pivot.CBM: ${.CURDIR}/CBM/charset.pivot.CBM.src
+ ${_MKTARGET_CREATE}
+ ( echo "# CBM" ; cat ${.ALLSRC} ; echo ) > ${.TARGET}
+
+FILES+= ${MAPS_CBM}
+CLEANFILES+= ${MAPS_CBM}
+.for i in ${MAPS_CBM}
+FILESDIR_$i=${BINDIR}/CBM
+.endfor
+
Index: src/share/i18n/csmapper/CBM/UCS%CBMINT.src
diff -u /dev/null src/share/i18n/csmapper/CBM/UCS%CBMINT.src:1.1
--- /dev/null Wed Apr 27 20:05:57 2011
+++ src/share/i18n/csmapper/CBM/UCS%CBMINT.src Wed Apr 27 20:05:56 2011
@@ -0,0 +1,88 @@
+# $NetBSD: UCS%CBMINT.src,v 1.1 2011/04/27 20:05:56 mbalmer Exp $
+
+TYPE ROWCOL
+NAME "UCS/CBMINT"
+SRC_ZONE 0x0000-0x221E
+OOB_MODE INVALID
+DST_INVALID 0xFFFF
+DST_UNIT_BITS 16
+
+BEGIN_MAP
+#
+# This mapping data is made from data provided by Japan CBM Corporation,
+# Information Systems Div.
+# Original notice:
+#
+# Name: CBM International Character Codes to Unicode table
+# Unicode version: 2.0
+# Table version: 2.00
+# Table format: Format A
+# Date: 04/27/2011
+# Authors: Marc Balmer <m...@msys.ch>
+# General notes: none
+#
+# Format: Three tab-separated columns
+# Column #1 is the CBMINT 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 CBMINT order
+#
+0x0000 - 0x007F = 0x00 -
+0x00A3 = 0xA0
+0x2103 = 0xA1
+0x2109 = 0xA2
+0x03A9 = 0xA3
+0x00B5 = 0xA4
+0x03A3 = 0xA5
+0x03C3 = 0xA6
+0x00A2 = 0xA8
+0x00D7 = 0xA9
+0x221E = 0xAA
+0x00B1 = 0xAB
+0x00F7 = 0xAC
+0x03C0 = 0xAD
+0x00C4 = 0xAE
+0x00D6 = 0xAF
+0x00DC = 0xB0
+0x03B2 = 0xB1
+0x00A7 = 0xB2
+0x00BA = 0xB4
+0x00B0 = 0xB5
+0x00BD = 0xB7
+0x00BC = 0xBB
+0x00C3 = 0xBC
+0x00EB = 0xBD
+0x00E9 = 0xBE
+0x00E8 = 0xBF
+0x0113 = 0xC0
+0x00EA = 0xC1
+0x00EF = 0xC2
+0x00ED = 0xC3
+0x00EC = 0xC4
+0x012B = 0xC5
+0x00EE = 0xC6
+0x00F6 = 0xC7
+0x00F3 = 0xC8
+0x00F2 = 0xC9
+0x00F5 = 0xCA
+0x00F4 = 0xCB
+0x00FC = 0xCC
+0x00FA = 0xCD
+0x00F9 = 0xCE
+0x016B = 0xCF
+0x00FB = 0xD0
+0x00E7 = 0xD1
+0x00BF = 0xD2
+0x00D1 = 0xD3
+0x00F1 = 0xD4
+0x0112 = 0xD5
+0x00C5 = 0xD8
+0x03D5 = 0xD9
+0x03B8 = 0xDA
+0x00E4 = 0xDB
+0x00E1 = 0xDC
+0x00E0 = 0xDD
+0x00E3 = 0xDE
+0x00E2 = 0xDF
+END_MAP
Index: src/share/i18n/csmapper/CBM/charset.pivot.CBM.src
diff -u /dev/null src/share/i18n/csmapper/CBM/charset.pivot.CBM.src:1.1
--- /dev/null Wed Apr 27 20:05:57 2011
+++ src/share/i18n/csmapper/CBM/charset.pivot.CBM.src Wed Apr 27 20:05:56 2011
@@ -0,0 +1,2 @@
+# $NetBSD: charset.pivot.CBM.src,v 1.1 2011/04/27 20:05:56 mbalmer Exp $
+
Index: src/share/i18n/csmapper/CBM/mapper.dir.CBM.src
diff -u /dev/null src/share/i18n/csmapper/CBM/mapper.dir.CBM.src:1.1
--- /dev/null Wed Apr 27 20:05:57 2011
+++ src/share/i18n/csmapper/CBM/mapper.dir.CBM.src Wed Apr 27 20:05:56 2011
@@ -0,0 +1,2 @@
+# $NetBSD: mapper.dir.CBM.src,v 1.1 2011/04/27 20:05:56 mbalmer Exp $
+
Index: src/share/i18n/esdb/CBM/CBMINT.src
diff -u /dev/null src/share/i18n/esdb/CBM/CBMINT.src:1.1
--- /dev/null Wed Apr 27 20:05:57 2011
+++ src/share/i18n/esdb/CBM/CBMINT.src Wed Apr 27 20:05:56 2011
@@ -0,0 +1,7 @@
+# $NetBSD: CBMINT.src,v 1.1 2011/04/27 20:05:56 mbalmer Exp $
+
+NAME "CBMINT"
+ENCODING "NONE"
+VARIABLE "none"
+DEFCSID "CBMINT" 0
+INVALID 0x3F # '?'
Index: src/share/i18n/esdb/CBM/Makefile.inc
diff -u /dev/null src/share/i18n/esdb/CBM/Makefile.inc:1.1
--- /dev/null Wed Apr 27 20:05:57 2011
+++ src/share/i18n/esdb/CBM/Makefile.inc Wed Apr 27 20:05:56 2011
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile.inc,v 1.1 2011/04/27 20:05:56 mbalmer Exp $
+
+.PATH: ${.CURDIR}/CBM
+
+CODESETS_CBM!= ${TOOL_SED} \
+ '/^\#/d;/^ *$$/d;/^[ ]*/s///;s/[ ].*//' \
+ ${.CURDIR}/CBM/esdb.dir.CBM.src
+ESDB_CBM:= ${CODESETS_CBM:C/$/.esdb/:S/:/@/}
+
+SRC_esdb.dir+= esdb.dir.CBM.src
+SRC_esdb.alias+= esdb.alias.CBM.src
+FILES+= ${ESDB_CBM}
+CLEANFILES+= ${ESDB_CBM}
+.for i in ${ESDB_CBM}
+FILESDIR_$i:= ${BINDIR}/CBM
+.endfor
Index: src/share/i18n/esdb/CBM/esdb.alias.CBM.src
diff -u /dev/null src/share/i18n/esdb/CBM/esdb.alias.CBM.src:1.1
--- /dev/null Wed Apr 27 20:05:57 2011
+++ src/share/i18n/esdb/CBM/esdb.alias.CBM.src Wed Apr 27 20:05:56 2011
@@ -0,0 +1,3 @@
+# $NetBSD: esdb.alias.CBM.src,v 1.1 2011/04/27 20:05:56 mbalmer Exp $
+
+CBM-International CBMINT
Index: src/share/i18n/esdb/CBM/esdb.dir.CBM.src
diff -u /dev/null src/share/i18n/esdb/CBM/esdb.dir.CBM.src:1.1
--- /dev/null Wed Apr 27 20:05:57 2011
+++ src/share/i18n/esdb/CBM/esdb.dir.CBM.src Wed Apr 27 20:05:56 2011
@@ -0,0 +1,3 @@
+# $NetBSD: esdb.dir.CBM.src,v 1.1 2011/04/27 20:05:56 mbalmer Exp $
+
+CBMINT CBM/CBMINT.esdb
