[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemacs-commit] qemacs jistoqe.c charsetjis.def charsetmore.c c...
From: |
Charlie Gordon |
Subject: |
[Qemacs-commit] qemacs jistoqe.c charsetjis.def charsetmore.c c... |
Date: |
Sat, 25 Mar 2017 14:13:33 -0400 (EDT) |
CVSROOT: /sources/qemacs
Module name: qemacs
Changes by: Charlie Gordon <chqrlie> 17/03/25 14:13:32
Modified files:
. : jistoqe.c charsetjis.def charsetmore.c cptoqe.c
fbftoqe.c kmap.c kmaptoqe.c ligtoqe.c
Log message:
utilities: sundries
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/jistoqe.c?cvsroot=qemacs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/qemacs/charsetjis.def?cvsroot=qemacs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/qemacs/charsetmore.c?cvsroot=qemacs&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/qemacs/cptoqe.c?cvsroot=qemacs&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/qemacs/fbftoqe.c?cvsroot=qemacs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/qemacs/kmap.c?cvsroot=qemacs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/qemacs/kmaptoqe.c?cvsroot=qemacs&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/qemacs/ligtoqe.c?cvsroot=qemacs&r1=1.10&r2=1.11
Patches:
Index: jistoqe.c
===================================================================
RCS file: /sources/qemacs/qemacs/jistoqe.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- jistoqe.c 7 Jan 2014 00:57:22 -0000 1.5
+++ jistoqe.c 25 Mar 2017 18:13:32 -0000 1.6
@@ -2,6 +2,7 @@
* Convert Unicode JIS tables to QEmacs format
*
* Copyright (c) 2002 Fabrice Bellard.
+ * Copyright (c) 2002-2017 Charlie Gordon.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -51,7 +52,7 @@
}
/* handle jis208 or jis212 table */
-static void handle_jis(FILE **fp, const char *name, const char *filename)
+static void handle_jis(FILE *f, const char *name, const char *filename)
{
int c1, c2, b1, b2, b1_max, b2_max, i, j, nb, n;
int table[94*94];
@@ -77,9 +78,7 @@
b1_max = 0;
b2_max = 0;
nb = 0;
- for (;;) {
- if (!getline(line, sizeof(line), *fp, 1))
- break;
+ while (getline(line, sizeof(line), f, 1)) {
p = line;
if (is_jis208)
c1 = strtol(p, (char **)&p, 0);
@@ -92,11 +91,11 @@
/* compress the code */
b1 = b1 - 0x21;
b2 = b2 - 0x21;
- if (b1 > b1_max)
+ if (b1_max < b1)
b1_max = b1;
- if (b2 > b2_max)
+ if (b2_max < b2)
b2_max = b2;
- if (b2 > table_b2_max[b1])
+ if (table_b2_max[b1] < b2)
table_b2_max[b1] = b2;
table[b1 * 94 + b2] = c2;
nb++;
@@ -143,6 +142,7 @@
printf("\n" "/*"
"\n" " * JIS Tables for QEmacs"
"\n" " * Copyright (c) 2002 Fabrice Bellard."
+ "\n" " * Copyright (c) 2002-2017 Charlie Gordon."
"\n" " *"
"\n" " * This library is free software; you can redistribute it
and/or"
"\n" " * modify it under the terms of the GNU Lesser General Public"
@@ -173,7 +173,7 @@
exit(1);
}
- handle_jis(&f, name, filename);
+ handle_jis(f, name, filename);
fclose(f);
}
Index: charsetjis.def
===================================================================
RCS file: /sources/qemacs/qemacs/charsetjis.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- charsetjis.def 3 Jan 2008 09:51:30 -0000 1.2
+++ charsetjis.def 25 Mar 2017 18:13:32 -0000 1.3
@@ -3,6 +3,7 @@
/*
* JIS Tables for QEmacs
* Copyright (c) 2002 Fabrice Bellard.
+ * Copyright (c) 2002-2017 Charlie Gordon.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: charsetmore.c
===================================================================
RCS file: /sources/qemacs/qemacs/charsetmore.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- charsetmore.c 19 Aug 2015 16:22:30 -0000 1.20
+++ charsetmore.c 25 Mar 2017 18:13:32 -0000 1.21
@@ -4,7 +4,7 @@
* More Charsets and Tables for QEmacs
*
* Copyright (c) 2002 Fabrice Bellard.
- * Copyright (c) 2002-2008 Charlie Gordon.
+ * Copyright (c) 2002-2017 Charlie Gordon.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: cptoqe.c
===================================================================
RCS file: /sources/qemacs/qemacs/cptoqe.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- cptoqe.c 19 Aug 2015 16:22:30 -0000 1.18
+++ cptoqe.c 25 Mar 2017 18:13:32 -0000 1.19
@@ -2,7 +2,7 @@
* Convert Unicode 8-bit code page files to QEmacs format
*
* Copyright (c) 2002 Fabrice Bellard.
- * Copyright (c) 2007-2008 Charlie Gordon.
+ * Copyright (c) 2007-2017 Charlie Gordon.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -114,12 +114,13 @@
base = get_basename_offset(includename);
pstrcpy(includename + base, sizeof(includename) - base,
skipspaces(p + 8));
+ filename = includename;
f = fopen(includename, "r");
if (f == NULL) {
fprintf(stderr, "%s: cannot open %s\n", name, includename);
f = f0;
+ filename = fname;
}
- filename = includename;
continue;
}
@@ -176,9 +177,9 @@
max_code = -1;
for (i = 0; i < 256; i++) {
if (table[i] != i) {
- if (i < min_code)
+ if (min_code > i)
min_code = i;
- if (i > max_code)
+ if (max_code < i)
max_code = i;
}
}
@@ -229,24 +230,25 @@
}
}
}
- printf("\",\n");
+ printf("\",");
- printf(" NULL,\n"
- " decode_8bit_init,\n"
- " decode_8bit,\n"
- " encode_8bit,\n"
- " charset_get_pos_8bit,\n"
- " charset_get_chars_8bit,\n"
- " charset_goto_char_8bit,\n"
- " charset_goto_line_8bit,\n"
- " .char_size = 1,\n"
- " .variable_size = 0,\n"
- " .table_alloc = 1,\n"
- " .eol_char = %d,\n"
- " .min_char = %d,\n"
- " .max_char = %d,\n"
- " .private_table = table_%s,\n"
- "};\n\n",
+ printf("\n" " NULL,"
+ "\n" " decode_8bit_init,"
+ "\n" " decode_8bit,"
+ "\n" " encode_8bit,"
+ "\n" " charset_get_pos_8bit,"
+ "\n" " charset_get_chars_8bit,"
+ "\n" " charset_goto_char_8bit,"
+ "\n" " charset_goto_line_8bit,"
+ "\n" " .char_size = 1,"
+ "\n" " .variable_size = 0,"
+ "\n" " .table_alloc = 1,"
+ "\n" " .eol_char = %d,"
+ "\n" " .min_char = %d,"
+ "\n" " .max_char = %d,"
+ "\n" " .private_table = table_%s,"
+ "\n" "};"
+ "\n\n",
eol_char, min_code, max_code, name_id);
add_init(" qe_register_charset(&charset_");
@@ -303,7 +305,7 @@
"\n" " * More Charsets and Tables for QEmacs"
"\n" " *"
"\n" " * Copyright (c) 2002 Fabrice Bellard."
- "\n" " * Copyright (c) 2002-2008 Charlie Gordon."
+ "\n" " * Copyright (c) 2002-2017 Charlie Gordon."
"\n" " *"
"\n" " * This library is free software; you can redistribute it
and/or"
"\n" " * modify it under the terms of the GNU Lesser General Public"
Index: fbftoqe.c
===================================================================
RCS file: /sources/qemacs/qemacs/fbftoqe.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- fbftoqe.c 17 Dec 2013 23:42:53 -0000 1.9
+++ fbftoqe.c 25 Mar 2017 18:13:32 -0000 1.10
@@ -2,7 +2,7 @@
* Convert FBF fonts into source code to link them in QEmacs.
*
* Copyright (c) 2002 Fabrice Bellard.
- * Copyright (c) 2007-2008 Charlie Gordon.
+ * Copyright (c) 2007-2017 Charlie Gordon.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: kmap.c
===================================================================
RCS file: /sources/qemacs/qemacs/kmap.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- kmap.c 23 Jan 2014 12:56:22 -0000 1.3
+++ kmap.c 25 Mar 2017 18:13:32 -0000 1.4
@@ -2,7 +2,7 @@
* Kmap file based input method handling for QEmacs.
*
* Copyright (c) 2000 Fabrice Bellard.
- * Copyright (c) 2002-2008 Charlie Gordon.
+ * Copyright (c) 2002-2017 Charlie Gordon.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: kmaptoqe.c
===================================================================
RCS file: /sources/qemacs/qemacs/kmaptoqe.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- kmaptoqe.c 1 Mar 2014 22:37:26 -0000 1.12
+++ kmaptoqe.c 25 Mar 2017 18:13:32 -0000 1.13
@@ -2,7 +2,7 @@
* Convert Yudit kmap files to QEmacs binary internal format
*
* Copyright (c) 2002 Fabrice Bellard.
- * Copyright (c) 2007-2014 Charlie Gordon.
+ * Copyright (c) 2007-2017 Charlie Gordon.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Index: ligtoqe.c
===================================================================
RCS file: /sources/qemacs/qemacs/ligtoqe.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ligtoqe.c 1 Mar 2014 22:37:26 -0000 1.10
+++ ligtoqe.c 25 Mar 2017 18:13:32 -0000 1.11
@@ -2,7 +2,7 @@
* Convert ligature files to QEmacs binary internal format
*
* Copyright (c) 2002 Fabrice Bellard.
- * Copyright (c) 2007-2008 Charlie Gordon.
+ * Copyright (c) 2007-2017 Charlie Gordon.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemacs-commit] qemacs jistoqe.c charsetjis.def charsetmore.c c...,
Charlie Gordon <=