[Qemacs-commit] qemacs Makefile cptoqe.c cutils.c cutils.h fbft...

[Charlie Gordon]

CVSROOT:        /cvsroot/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        07/12/03 10:40:22

Modified files:
        .              : Makefile cptoqe.c cutils.c cutils.h fbftoqe.c 
                         html2png.c input.c kmaptoqe.c ligtoqe.c 
        kmap           : README 

Log message:
        Added missing headings
        Cosmetics
        Fixed Makefile details

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/Makefile?cvsroot=qemacs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/qemacs/cptoqe.c?cvsroot=qemacs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/qemacs/cutils.c?cvsroot=qemacs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/qemacs/cutils.h?cvsroot=qemacs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/qemacs/fbftoqe.c?cvsroot=qemacs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/qemacs/html2png.c?cvsroot=qemacs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/qemacs/input.c?cvsroot=qemacs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/qemacs/kmaptoqe.c?cvsroot=qemacs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/qemacs/ligtoqe.c?cvsroot=qemacs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/qemacs/kmap/README?cvsroot=qemacs&r1=1.1&r2=1.2

Patches:
Index: Makefile
===================================================================
RCS file: /cvsroot/qemacs/qemacs/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- Makefile    3 Dec 2007 10:18:34 -0000       1.10
+++ Makefile    3 Dec 2007 10:40:21 -0000       1.11
@@ -204,17 +204,17 @@
 
 clean:
        make -C libqhtml clean
-       rm -f *.o *.exe *~ TAGS gmon.out core qe.exe.stackdump \
-           qe qe_g qfribidi kmaptoqe ligtoqe html2png fbftoqe fbffonts.c
+       rm -f *.o *.exe *~ TAGS gmon.out core *.exe.stackdump \
+           qe qe_g qfribidi cptoqe kmaptoqe ligtoqe html2png fbftoqe fbffonts.c
 
 distclean: clean
        rm -f config.h config.mak
 
 install: $(TARGETS) qe.1
-       install -m 755 qe$(EXE) $(prefix)/bin/qemacs
+       install -m 755 qe$(EXE) $(prefix)/bin/qemacs$(EXE)
        ln -sf qemacs $(prefix)/bin/qe$(EXE)
 ifdef CONFIG_FFMPEG
-       ln -sf qemacs $(prefix)/bin/ffplay
+       ln -sf qemacs$(EXE) $(prefix)/bin/ffplay$(EXE)
 endif
        mkdir -p $(prefix)/share/qe
        install kmaps ligatures $(prefix)/share/qe
@@ -352,8 +352,8 @@
 # html2png tool (XML/HTML/CSS2 renderer test tool)
 #
 OBJS=util.o cutils.o \
-     arabic.o indic.o qfribidi.o \
-     display.o unicode_join.o charset.o charsetmore.o charset_table.o \
+     arabic.o indic.o qfribidi.o display.o unicode_join.o \
+     charset.o charsetmore.o charset_table.o \
      libfbf.o fbfrender.o cfb.o fbffonts.o
 
 html2png$(EXE): html2png.o $(OBJS) libqhtml/libqhtml.a

Index: cptoqe.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/cptoqe.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cptoqe.c    11 May 2005 15:12:14 -0000      1.2
+++ cptoqe.c    3 Dec 2007 10:40:21 -0000       1.3
@@ -1,10 +1,30 @@
-/* convert unicode cp pages to qe source code */
+/*
+ * Convert Unicode 8-bit code page files to QEmacs format
+ *
+ * Copyright (c) 2002 Fabrice Bellard.
+ * Copyright (c) 2007 Charlie Gordon.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 
-char *getline(char *buf, int buf_size, FILE *f)
+static char *getline(char *buf, int buf_size, FILE *f)
 {
     char *str;
     int len;
@@ -20,7 +40,7 @@
 }
 
 
-void handle_cp(FILE *f, const char *name)
+static void handle_cp(FILE *f, const char *name)
 {
     char line[1024];
     const char *p;
@@ -108,7 +128,7 @@
 }
 
 /* handle jis208 or jis212 table */
-void handle_jis(FILE *f, int is_jis208)
+static void handle_jis(FILE *f, int is_jis208)
 {
     int c1, c2, b1, b2, b1_max, b2_max, i, j, nb, n;
     int table[94*94];

Index: cutils.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/cutils.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- cutils.c    31 Dec 2006 19:34:01 -0000      1.7
+++ cutils.c    3 Dec 2007 10:40:21 -0000       1.8
@@ -16,6 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

Index: cutils.h
===================================================================
RCS file: /cvsroot/qemacs/qemacs/cutils.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- cutils.h    31 Dec 2006 19:34:01 -0000      1.7
+++ cutils.h    3 Dec 2007 10:40:21 -0000       1.8
@@ -1,3 +1,23 @@
+/*
+ * QEmacs, tiny but powerful multimode editor
+ *
+ * Copyright (c) 2000,2001 Fabrice Bellard.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
 #ifndef CUTILS_H
 #define CUTILS_H
 

Index: fbftoqe.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/fbftoqe.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- fbftoqe.c   31 Dec 2006 19:34:01 -0000      1.3
+++ fbftoqe.c   3 Dec 2007 10:40:21 -0000       1.4
@@ -1,12 +1,29 @@
 /*
- * convert FBF fonts into source file so that so resources are needed
- * for fonts 
+ * Convert FBF fonts into source code to link them in QEmacs.
+ *
+ * Copyright (c) 2002 Fabrice Bellard.
+ * Copyright (c) 2007 Charlie Gordon.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "cutils.h"
 
+#include "cutils.h"
 
 static void dump_font(const char *filename, const char *name)
 {

Index: html2png.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/html2png.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- html2png.c  31 Dec 2006 19:34:01 -0000      1.6
+++ html2png.c  3 Dec 2007 10:40:21 -0000       1.7
@@ -16,6 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 #include "qe.h"
 #include "css.h"
 #include "cfb.h"

Index: input.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/input.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7

Index: kmaptoqe.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/kmaptoqe.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- kmaptoqe.c  11 May 2005 15:12:14 -0000      1.2
+++ kmaptoqe.c  3 Dec 2007 10:40:21 -0000       1.3
@@ -1,4 +1,23 @@
-/* convert yudit kmap files to qe binary internal format */
+/*
+ * Convert Yudit kmap files to QEmacs binary internal format
+ *
+ * Copyright (c) 2002 Fabrice Bellard.
+ * Copyright (c) 2007 Charlie Gordon.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include <stdlib.h>
 #include <stdio.h>

Index: ligtoqe.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/ligtoqe.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ligtoqe.c   11 May 2005 15:12:14 -0000      1.2
+++ ligtoqe.c   3 Dec 2007 10:40:21 -0000       1.3
@@ -1,4 +1,23 @@
-/* convert ligature files to qe binary internal format */
+/*
+/* Convert ligature files to QEmacs binary internal format
+ *
+ * Copyright (c) 2002 Fabrice Bellard.
+ * Copyright (c) 2007 Charlie Gordon.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -7,7 +26,7 @@
 #include <getopt.h>
 #include <assert.h>
 
-int unicode_to_utf8(char *buf, unsigned int c)
+static int unicode_to_utf8(char *buf, unsigned int c)
 {
     char *q;
 
@@ -42,7 +61,7 @@
     return q - buf;
 }
 
-void put_be16(FILE *outfile, int off)
+static void put_be16(FILE *outfile, int off)
 {
     fputc((off >> 8) & 0xff, outfile);
     fputc((off) & 0xff, outfile);
@@ -58,7 +77,7 @@
 Ligature ligs[MAX_LIGS];
 int nb_ligs;
 
-int sort_func(const void *a1, const void *b1)
+static int sort_func(const void *a1, const void *b1)
 {
     const Ligature *a = a1;
     const Ligature *b = b1;
@@ -72,7 +91,7 @@
     return val;
 }
 
-void help(void)
+static void help(void)
 {
     printf("usage: ligtoqe [-u] sourcefile.lig output_ligature_file\n"
            "Build a ligature resource file for qemacs\n"

Index: kmap/README
===================================================================
RCS file: /cvsroot/qemacs/qemacs/kmap/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- kmap/README 3 Dec 2007 10:18:39 -0000       1.1
+++ kmap/README 3 Dec 2007 10:40:21 -0000       1.2
@@ -1 +1 @@
-Keymap files copied from pre-1.6 Yudit sources
+Keymap files copied from pre-1.6 Yudit sources at http://czyborra.com/yudit