[Qemacs-commit] qemacs charsetmore.c cptoqe.c cp/kamen.cp

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        14/03/01 21:57:29

Modified files:
        .              : charsetmore.c cptoqe.c 
        cp             : kamen.cp 

Log message:
        Fix charset converter cptoqe.c
        
        * make mac_roman public
        * fix kamen charset to remove control char transaltions

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/charsetmore.c?cvsroot=qemacs&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/qemacs/cptoqe.c?cvsroot=qemacs&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/qemacs/cp/kamen.cp?cvsroot=qemacs&r1=1.1&r2=1.2

Patches:
Index: charsetmore.c
===================================================================
RCS file: /sources/qemacs/qemacs/charsetmore.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- charsetmore.c       10 Feb 2014 20:29:26 -0000      1.17
+++ charsetmore.c       1 Mar 2014 21:57:28 -0000       1.18
@@ -1186,39 +1186,23 @@
  *       id: kamen
  */
 
-static const unsigned short table_kamen[255] = {
-    0x263a, 0x263b, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022, 0x25d8,
-    0x25cb, 0x25d9, 0x2642, 0x2640, 0x266a, 0x266b, 0x263c, 0x25b6,
-    0x25c0, 0x2195, 0x203c, 0x00b6, 0x00a7, 0x25ac, 0x21a8, 0x2191,
-    0x2193, 0x2192, 0x2190, 0x221f, 0x2194, 0x25b2, 0x25bc, 0x0020,
-    0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028,
-    0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030,
-    0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038,
-    0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040,
-    0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048,
-    0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, 0x0050,
-    0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058,
-    0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, 0x0060,
-    0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068,
-    0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070,
-    0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078,
-    0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x2302, 0x010c,
-    0x00fc, 0x00e9, 0x010f, 0x00e4, 0x010e, 0x0164, 0x010d, 0x011b,
-    0x011a, 0x0139, 0x00cd, 0x013e, 0x013a, 0x00c4, 0x00c1, 0x00c9,
-    0x017e, 0x017d, 0x00f4, 0x00f6, 0x00d3, 0x016f, 0x00da, 0x00fd,
-    0x00d6, 0x00dc, 0x0160, 0x013d, 0x00dd, 0x0158, 0x0165, 0x00e1,
-    0x00ed, 0x00f3, 0x00fa, 0x0148, 0x0147, 0x016e, 0x00d4, 0x0161,
-    0x0159, 0x0155, 0x0154, 0x00bc, 0x00a7, 0x00bb, 0x00ab, 0x2591,
-    0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, 0x2555,
-    0x2563, 0x2551, 0x2557, 0x255d, 0x255c, 0x255b, 0x2510, 0x2514,
-    0x2534, 0x252c, 0x251c, 0x2500, 0x253c, 0x255e, 0x255f, 0x255a,
-    0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256c, 0x2567, 0x2568,
-    0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256b, 0x256a,
-    0x2518, 0x250c, 0x2588, 0x2584, 0x258c, 0x2590, 0x2580, 0x03b1,
-    0x03b2, 0x0194, 0x03c0, 0x03a3, 0x03c3, 0x03bc, 0x03c4, 0x03a6,
-    0x0398, 0x03a9, 0x03b4, 0x221e, 0x03c6, 0x2208, 0x2229, 0x224d,
-    0x00b1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00f7, 0x2248, 0x00b0,
-    0x2219, 0x00b7, 0x221a, 0x207f, 0x00b2, 0x25a0, 0x00a0,
+static const unsigned short table_kamen[128] = {
+    0x010c, 0x00fc, 0x00e9, 0x010f, 0x00e4, 0x010e, 0x0164, 0x010d,
+    0x011b, 0x011a, 0x0139, 0x00cd, 0x013e, 0x013a, 0x00c4, 0x00c1,
+    0x00c9, 0x017e, 0x017d, 0x00f4, 0x00f6, 0x00d3, 0x016f, 0x00da,
+    0x00fd, 0x00d6, 0x00dc, 0x0160, 0x013d, 0x00dd, 0x0158, 0x0165,
+    0x00e1, 0x00ed, 0x00f3, 0x00fa, 0x0148, 0x0147, 0x016e, 0x00d4,
+    0x0161, 0x0159, 0x0155, 0x0154, 0x00bc, 0x00a7, 0x00bb, 0x00ab,
+    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
+    0x2555, 0x2563, 0x2551, 0x2557, 0x255d, 0x255c, 0x255b, 0x2510,
+    0x2514, 0x2534, 0x252c, 0x251c, 0x2500, 0x253c, 0x255e, 0x255f,
+    0x255a, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256c, 0x2567,
+    0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256b,
+    0x256a, 0x2518, 0x250c, 0x2588, 0x2584, 0x258c, 0x2590, 0x2580,
+    0x03b1, 0x03b2, 0x0194, 0x03c0, 0x03a3, 0x03c3, 0x03bc, 0x03c4,
+    0x03a6, 0x0398, 0x03a9, 0x03b4, 0x221e, 0x03c6, 0x2208, 0x2229,
+    0x224d, 0x00b1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00f7, 0x2248,
+    0x00b0, 0x2219, 0x00b7, 0x221a, 0x207f, 0x00b2, 0x25a0, 0x00a0,
 };
 
 static QECharset charset_kamen = {
@@ -1235,7 +1219,7 @@
     .variable_size = 0,
     .table_alloc = 1,
     .eol_char = 10,
-    .min_char = 1,
+    .min_char = 128,
     .max_char = 255,
     .private_table = table_kamen,
 };

Index: cptoqe.c
===================================================================
RCS file: /sources/qemacs/qemacs/cptoqe.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- cptoqe.c    7 Jan 2014 00:57:22 -0000       1.15
+++ cptoqe.c    1 Mar 2014 21:57:29 -0000       1.16
@@ -208,7 +208,10 @@
         printf("};\n\n");
     }
 
-    printf("static QECharset charset_%s = {\n"
+    if (strcmp(name_id, "mac_roman"))
+        printf("static ");
+
+    printf("QECharset charset_%s = {\n"
            "    \"%s\",\n",
            name_id, name);
 

Index: cp/kamen.cp
===================================================================
RCS file: /sources/qemacs/qemacs/cp/kamen.cp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- cp/kamen.cp 3 Dec 2007 10:18:35 -0000       1.1
+++ cp/kamen.cp 1 Mar 2014 21:57:29 -0000       1.2
@@ -5,38 +5,38 @@
 # Czech characters extracted from CStoCS "kam.enc" and others copied from
 # IBM charset by Martin Mares <address@hidden>
 
-0x00   0x0000  #<control>
-0x01   0x263A  #WHITE SMILING FACE
-0x02   0x263B  #BLACK SMILING FACE
-0x03   0x2665  #BLACK HEART SUIT
-0x04   0x2666  #BLACK DIAMOND SUIT
-0x05   0x2663  #BLACK CLUB SUIT
-0x06   0x2660  #BLACK SPADE SUIT
-0x07   0x2022  #BULLET
-0x08   0x25D8  #INVERSE BULLET
-0x09   0x25CB  #WHITE CIRCLE
-0x0A   0x25D9  #INVERSE WHITE CIRCLE
-0x0B   0x2642  #MALE SIGN
-0x0C   0x2640  #FEMALE SIGN
-0x0D   0x266A  #EIGHTH NOTE
-0x0E   0x266B  #BEAMED EIGHTH NOTES
-0x0F   0x263C  #WHITE SUN WITH RAYS
-0x10   0x25B6  #BLACK RIGHT-POINTING TRIANGLE
-0x11   0x25C0  #BLACK LEFT-POINTING TRIANGLE
-0x12   0x2195  #UP DOWN ARROW
-0x13   0x203C  #DOUBLE EXCLAMATION MARK
-0x14   0x00B6  #PILCROW SIGN
-0x15   0x00A7  #SECTION SIGN
-0x16   0x25AC  #BLACK RECTANGLE
-0x17   0x21A8  #UP DOWN ARROW WITH BASE
-0x18   0x2191  #UPWARDS ARROW
-0x19   0x2193  #DOWNWARDS ARROW
-0x1A   0x2192  #RIGHTWARDS ARROW
-0x1B   0x2190  #LEFTWARDS ARROW
-0x1C   0x221F  #RIGHT ANGLE
-0x1D   0x2194  #LEFT RIGHT ARROW
-0x1E   0x25B2  #BLACK UP-POINTING TRIANGLE
-0x1F   0x25BC  #BLACK DOWN-POINTING TRIANGLE
+# 0x00 0x0000  #<control>
+# 0x01 0x263A  #WHITE SMILING FACE
+# 0x02 0x263B  #BLACK SMILING FACE
+# 0x03 0x2665  #BLACK HEART SUIT
+# 0x04 0x2666  #BLACK DIAMOND SUIT
+# 0x05 0x2663  #BLACK CLUB SUIT
+# 0x06 0x2660  #BLACK SPADE SUIT
+# 0x07 0x2022  #BULLET
+# 0x08 0x25D8  #INVERSE BULLET
+# 0x09 0x25CB  #WHITE CIRCLE
+# 0x0A 0x25D9  #INVERSE WHITE CIRCLE
+# 0x0B 0x2642  #MALE SIGN
+# 0x0C 0x2640  #FEMALE SIGN
+# 0x0D 0x266A  #EIGHTH NOTE
+# 0x0E 0x266B  #BEAMED EIGHTH NOTES
+# 0x0F 0x263C  #WHITE SUN WITH RAYS
+# 0x10 0x25B6  #BLACK RIGHT-POINTING TRIANGLE
+# 0x11 0x25C0  #BLACK LEFT-POINTING TRIANGLE
+# 0x12 0x2195  #UP DOWN ARROW
+# 0x13 0x203C  #DOUBLE EXCLAMATION MARK
+# 0x14 0x00B6  #PILCROW SIGN
+# 0x15 0x00A7  #SECTION SIGN
+# 0x16 0x25AC  #BLACK RECTANGLE
+# 0x17 0x21A8  #UP DOWN ARROW WITH BASE
+# 0x18 0x2191  #UPWARDS ARROW
+# 0x19 0x2193  #DOWNWARDS ARROW
+# 0x1A 0x2192  #RIGHTWARDS ARROW
+# 0x1B 0x2190  #LEFTWARDS ARROW
+# 0x1C 0x221F  #RIGHT ANGLE
+# 0x1D 0x2194  #LEFT RIGHT ARROW
+# 0x1E 0x25B2  #BLACK UP-POINTING TRIANGLE
+# 0x1F 0x25BC  #BLACK DOWN-POINTING TRIANGLE
 0x20   0x0020  #SPACE
 0x21   0x0021  #EXCLAMATION MARK
 0x22   0x0022  #QUOTATION MARK
@@ -132,7 +132,7 @@
 0x7C   0x007C  #VERTICAL LINE
 0x7D   0x007D  #RIGHT CURLY BRACKET
 0x7E   0x007E  #TILDE
-0x7F   0x2302  #HOUSE
+# 0x7F 0x2302  #HOUSE
 0x80   0x010C  #LATIN CAPITAL LETTER C WITH CARON
 0x81   0x00FC  #LATIN SMALL LETTER U WITH DIAERESIS
 0x82   0x00E9  #LATIN SMALL LETTER E WITH ACUTE