Index: kit/CHANGELOG diff -u kit/CHANGELOG:1.9 kit/CHANGELOG:removed --- kit/CHANGELOG:1.9 Sat Sep 5 00:11:21 1998 +++ kit/CHANGELOG Mon Aug 9 05:10:00 2004 @@ -1,51 +0,0 @@ -CHANGELOG for magicpoint -$Id: CHANGELOG,v 1.9 1998/09/04 15:11:21 onoe Exp $ - -Fri Sep 5 1998 onoe@sm.sony.co.jp - * handle key inputs from invoked terminal as pressed on Xserver, - even if the Xserver is running on a remote host. - -Mon Aug 26 1998 itojun@iijlab.net - * new copyright. (BSDish copyright without clause 3) - -Mon Aug 25 1998 itojun@iijlab.net - * print.c: better x11/freetype/vflib -> postscript font mapping. - -Mon Aug 23 1998 kato@wide.ad.jp - * embedded image support (added mgpembed.pl and embed.c) - -Mon Aug 22 1998 itojun@iijlab.net - * added contrib/xmindpath, MindPath PocketPoint user-level driver. - -Fri Jul 10 11:57:59 JST 1998 itojun@iijlab.net - * cache gs-generated image file. - Suggested by: luigi@FreeBSD.org - -Mon Jul 6 11:38:32 JST 1998 itojun@iijlab.net - * capable of handling GB2312 and KSC5601 encoding. - they must be encoded by using iso-2022 like escape sequences. - EUC-cn or EUC-kr does not work. - * -x option is added. - -Thu Jul 2 18:04:16 JST 1998 itojun@iijlab.net - * eliminate gsview. - * revamp "xfont" directive. (see SYNTAX for detail) - -Thu Jun 25 13:10:28 JST 1998 itojun@iijlab.net - * print.c: color postscript support by "mgp2ps -c". - -changes between 1.02a and 1.03a: - * To allow color name that has space inbetween ("dark blue"), - color name after directives SHOULD come with doublequote. - Therefore, - %fore blue - should be - %fore "blue" - At this moment, doublequote can be ommitted for backward - compatibility. We may require to have doublequote in the future. - Font names and other string parameter obeys the same rule. - * %image is now capable of rendering encapsulated postscript files - (*.eps). - %image foo.eps - should work fine. - By using -X option, you can specify device name for ghostscript. Index: kit/configure diff -u kit/configure:1.95 kit/configure:1.97 --- kit/configure:1.95 Sat Jul 31 23:18:05 2004 +++ kit/configure Thu Aug 5 01:23:35 2004 @@ -5187,7 +5187,7 @@ OPTFLAGS="-I$ac_cv_fc_hdrdir $OPTFLAGS" fi fi - if test "$mgp_use_xft2" = "yes"; then + if test "$mgp_use_xft2" = "yes"; then echo "$as_me:$LINENO: checking for xft2 library.." >&5 echo $ECHO_N "checking for xft2 library..... $ECHO_C" >&6 echo "$as_me:$LINENO: checking for XftFontOpen in -lXft" >&5 @@ -5251,9 +5251,10 @@ #define USE_XFT2 1 _ACEOF + mgp_xft2_found=yes fi - fi + fi fi fi if test "$mgp_xft2_found" = "yes"; then @@ -5385,7 +5386,7 @@ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv_open" >&5 echo "${ECHO_T}$ac_cv_lib_iconv_iconv_open" >&6 if test $ac_cv_lib_iconv_iconv_open = yes; then - cat >>confdefs.h <<\_ACEOF + LIBS="$LIBS -liconv"; cat >>confdefs.h <<\_ACEOF #define HAVE_ICONV 1 _ACEOF @@ -5446,7 +5447,7 @@ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv_open" >&5 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6 if test $ac_cv_lib_iconv_libiconv_open = yes; then - cat >>confdefs.h <<\_ACEOF + LIBS="$LIBS -liconv"; cat >>confdefs.h <<\_ACEOF #define HAVE_ICONV 1 _ACEOF Index: kit/configure.in diff -u kit/configure.in:1.92 kit/configure.in:1.94 --- kit/configure.in:1.92 Sat Jul 31 23:18:05 2004 +++ kit/configure.in Thu Aug 5 01:23:35 2004 @@ -3,7 +3,7 @@ dnl independent (using srcdir), however, xmkmf and Imake.tmpl do not dnl allow us to switch compilation directory. dnl -dnl $Id: configure.in,v 1.92 2004/07/31 14:18:05 nishida Exp $ +dnl $Id: configure.in,v 1.94 2004/08/04 16:23:35 nishida Exp $ AC_INIT(image/imagetypes.c) dnl Checks for programs. @@ -366,19 +366,21 @@ OPTFLAGS="-I$ac_cv_fc_hdrdir $OPTFLAGS" fi fi - if test "$mgp_use_xft2" = "yes"; then + if test "$mgp_use_xft2" = "yes"; then AC_MSG_CHECKING(for xft2 library..) AC_CHECK_LIB(Xft, XftFontOpen, [LIBS="$LIBS -lXft -lfontconfig" - AC_DEFINE(USE_XFT2)], [], [-lfontconfig]) - fi + AC_DEFINE(USE_XFT2) + mgp_xft2_found=yes], [], [-lfontconfig]) + fi fi fi if test "$mgp_xft2_found" = "yes"; then AC_MSG_CHECKING(for iconv..) AC_CHECK_FUNC(iconv_open, [AC_DEFINE(HAVE_ICONV)], - [AC_CHECK_LIB(iconv, iconv_open, [AC_DEFINE(HAVE_ICONV)], - [AC_CHECK_LIB(iconv, libiconv_open, [AC_DEFINE(HAVE_ICONV)])])]) + [AC_CHECK_LIB(iconv, iconv_open, [LIBS="$LIBS -liconv"; AC_DEFINE(HAVE_ICONV)], + [AC_CHECK_LIB(iconv, libiconv_open, + [LIBS="$LIBS -liconv"; AC_DEFINE(HAVE_ICONV)])])]) fi AC_MSG_CHECKING(if gif handling is enabled) Index: kit/ctlwords.pl diff -u kit/ctlwords.pl:1.2 kit/ctlwords.pl:removed --- kit/ctlwords.pl:1.2 Sat Sep 5 06:05:08 1998 +++ kit/ctlwords.pl Mon Aug 9 05:10:00 2004 @@ -1,12 +0,0 @@ -#! /usr/bin/perl -$counter = 0; # 0 origin -print "/* generated by ctlwords.awk. do not edit by hand. */\n"; - -while (<>) { - next if (!/^\/\*CTL\*\//); - next if ($_ !~ /(CTL_[A-Z0-9]+)/); - - $word = $1; - print "#define $word\t$counter\n"; - $counter++; -} Index: kit/draw.c diff -u kit/draw.c:1.219 kit/draw.c:1.220 --- kit/draw.c:1.219 Fri Jul 16 14:28:08 2004 +++ kit/draw.c Wed Aug 4 01:40:06 2004 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /* - * $Id: draw.c,v 1.219 2004/07/16 05:28:08 nishida Exp $ + * $Id: draw.c,v 1.220 2004/08/03 16:40:06 nishida Exp $ */ #include "mgp.h" @@ -1580,7 +1580,7 @@ #ifdef USE_M17N case O_M17NTEXT: /* XXX we need to add free function for mtext data here! */ -// m17n_object_unref(obj->data.m17ntext.mt); + m17n_object_unref(obj->data.m17ntext.mt); break; #endif #ifdef MNG Index: kit/m17n.c diff -u kit/m17n.c:1.3 kit/m17n.c:1.4 --- kit/m17n.c:1.3 Sat Jul 31 23:18:05 2004 +++ kit/m17n.c Wed Aug 4 01:40:06 2004 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /* - * $Id: m17n.c,v 1.3 2004/07/31 14:18:05 nishida Exp $ + * $Id: m17n.c,v 1.4 2004/08/03 16:40:06 nishida Exp $ */ #ifdef USE_M17N @@ -147,7 +147,7 @@ for (i = 0; i < cached_count; i ++) if ((len == cached_txt_len[i]) && !memcmp((void *)p, (void *)cached_txt[i], cached_txt_len[i])){ - m17n_object_ref (cached_mt[i]); + m17n_object_ref(cached_mt[i]); return cached_mt[i]; } @@ -173,6 +173,7 @@ cached_txt_len[cached_count] = strlen(p); cached_mt[cached_count] = mt; cached_count = (cached_count + 1) % MAXCACHEDMTEXT; + m17n_object_ref(mt); return mt; } Index: kit/image/gif.h diff -u kit/image/gif.h:1.2 kit/image/gif.h:removed --- kit/image/gif.h:1.2 Mon Dec 28 17:23:03 1998 +++ kit/image/gif.h Mon Aug 9 05:10:00 2004 @@ -1,72 +0,0 @@ -/* gif.h: - * - * gifin.h - * kirk johnson - * november 1989 - * external interface to gifin.c - * - * Copyright 1989 Kirk L. Johnson (see the included file - * "kljcpyrght.h" for complete copyright information) - */ - -/* - * gifin return codes - */ -#define GIFIN_SUCCESS 0 /* success */ -#define GIFIN_DONE 1 /* no more images */ - -#define GIFIN_ERR_BAD_SD -1 /* bad screen descriptor */ -#define GIFIN_ERR_BAD_SEP -2 /* bad image separator */ -#define GIFIN_ERR_BAD_SIG -3 /* bad signature */ -#define GIFIN_ERR_EOD -4 /* unexpected end of raster data */ -#define GIFIN_ERR_EOF -5 /* unexpected end of input stream */ -#define GIFIN_ERR_FAO -6 /* file already open */ -#define GIFIN_ERR_IAO -7 /* image already open */ -#define GIFIN_ERR_NFO -8 /* no file open */ -#define GIFIN_ERR_NIO -9 /* no image open */ - -/* - * colormap indices - */ - -#define GIF_RED 0 -#define GIF_GRN 1 -#define GIF_BLU 2 - -/* - * typedef BYTE for convenience - */ - -typedef unsigned char BYTE; - -static int gifin_open_file(); -static int gifin_open_image(); -static int gifin_get_pixel(); -#if 0 -static int gifin_close_image(); -#endif -static int gifin_close_file(); -static int gifin_load_cmap(); -static int gifin_skip_extension(); -static int gifin_read_data_block(); -static int gifin_push_string(); -static void gifin_add_string(); -static void gifin_fatal(); - -/* #defines, typedefs, and such - */ - -#define GIF_SIG "GIF87a" -#define GIF_SIG_89 "GIF89a" -#define GIF_SIG_LEN 6 /* GIF signature length */ -#define GIF_SD_SIZE 7 /* GIF screen descriptor size */ -#define GIF_ID_SIZE 9 /* GIF image descriptor size */ - -#define GIF_SEPARATOR ',' /* GIF image separator */ -#define GIF_EXTENSION '!' /* GIF extension block marker */ -#define GIF_TERMINATOR ';' /* GIF terminator */ - -#define STAB_SIZE 4096 /* string table size */ -#define PSTK_SIZE 4096 /* pixel stack size */ - -#define NULL_CODE -1 /* string table null code */ Index: kit/sample/cloud.gif Index: kit/sample/dad.gif Index: kit/sample/dns-jp.mgp diff -u kit/sample/dns-jp.mgp:1.5 kit/sample/dns-jp.mgp:removed --- kit/sample/dns-jp.mgp:1.5 Fri Sep 4 21:33:18 1998 +++ kit/sample/dns-jp.mgp Mon Aug 9 05:10:01 2004 @@ -1,130 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% -%% This file is automatically created from the file -%% main.pre modified at Fri Jan 23 14:31:24 1998 -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% -%include "default.mgp" -%% "noop" cancels definitions in default.mgp -%default 1 left, size 7, fore "light yellow", back "blue4", font "standard", ccolor "white", vgap 35 -%default 2 noop -%default 3 fore "white", bar "gray70", vgap 10 -%default 4 noop -%tab 1 noop -%tab 2 noop -%tab 3 noop -%%% -%page -%nodefault -%fore "red", back "blue4", size 9, vgap 15 -%center, fore "yellow", font "thick" -%ccolor "white" - - - -Root DNS `M' について - -%size 6, fore "red", font "thick" -加藤 朗 - -%size 5, fore "white", font "standard" -東京大学大型計算機センター - - -%font "typewriter" -kato@wide.ad.jp -%font "standard" -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%page - -%back "blue4" - 経緯 (1) -%fore "red", size 6, font "thick" - ☆ Root DNS -%fore "white", size 5, font "standard" - ・ ９台で運用 -%fore "white", size 5, font "standard" - − ８台が US - − Stockholm に１台 -%fore "white", size 5, font "standard" - ・ 最大で１３台 -%fore "white", size 5, font "standard" - − パケット長の制約 -%fore "red", size 6, font "thick" - ☆ Root DNS の運用基準 -%fore "white", size 5, font "standard" - ・ RFC 2010 - ・ gTLD との関係 -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%page - -%back "blue4" - 経緯 (2) -%fore "red", size 6, font "thick" - ☆ IEPG で拡張を検討 - ☆ ヨーロッパ地域 -%fore "white", size 5, font "standard" - ・ LINX に新設 : 1997 年 4 月 -%fore "white", size 5, font "standard" - − RIPE/NCC が管理 - − `K' -%fore "red", size 6, font "thick" - ☆ アジア太平洋地域 -%fore "white", size 5, font "standard" - ・ NSPIXP-2 ： 1997 年 8 月 -%fore "white", size 5, font "standard" - − WIDE が管理 - − `M' -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%page - -%back "blue4" - `M' -%fore "red", size 6, font "thick" - ☆ 構成 -%fore "white", size 5, font "standard" - ・ ２台の PentiumPro 200MHz - ・ Primary/Backup、 自動切り替え -%fore "red", size 6, font "thick" - ☆ Root-only サーバ -%fore "white", size 5, font "standard" - ・ -%cont, font "typewriter" -202.12.27.33 -%font "standard" - ・ 400 〜 500 query/sec -%fore "red", size 6, font "thick" - ☆ 運用管理 -%fore "white", size 5, font "standard" - ・ WIDE および ISP 有志 -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%page - -%back "blue4" - お願い -%fore "red", size 6, font "thick" - ☆ 最新の root.cache の入れ換え -%fore "white", size 5, font "standard" - ・ -%cont, font "typewriter" -1997082200 -%fore "red", size 6, font "thick" - ☆ Named の更新 -%fore "white", size 5, font "standard" - ・ 4.9.6/8.8.1 -%fore "red", size 6, font "thick" - ☆ 遊ばないで： -%fore "white", size 5, font "standard" - ・ -%cont, font "typewriter" -ping/traceroute -%font "standard" - ・ -%cont, font "typewriter" -telnet/spray/... -%fore "red", size 6, font "thick" - ☆ Thanks to -%fore "white", size 5, font "standard" - ・ 日本 Cisco/多くの ISP - ・ `M' 管理グループ Index: kit/sample/mgp-old1.gif Index: kit/sample/mgp-old2.gif Index: kit/sample/mgp-old3.gif Index: kit/sample/mgp1.gif Index: kit/sample/mgp2.gif Index: kit/sample/mgp3.gif Index: kit/sample/v6header.gif