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 Jun 9 05:10:00 2003 @@ -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/README.xft diff -u /dev/null kit/README.xft:1.1 --- /dev/null Mon Jun 9 05:10:00 2003 +++ kit/README.xft Fri Jun 6 17:49:10 2003 @@ -0,0 +1,29 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + Configuring Xft2 and fontconfig for MagicPoint + + Jun 5, 2003 + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +From 1.10a, mgp supports Xft2 and fontconfig libraries. +To use these functions, you need to install them. + +If you have XFree86 4.2 or higher, probably Xft2 is already installed. But you +might have to install fontconfig. + +If you're using recent Linux distributions, they may be already installed +and configured. + +If you have the "fc-list" command which is part of the fontconfig package +and if it shows names of the fonts on your system, both libraries have been +successfully installed. + +If you don't have these libraries, the following URL will be useful. + +* http://www.fontconfig.org + you can get the most recent version of the fontconfig package and + configuration documents for setting up. + +* http://www.xfree86.org + you can get the most recent version of XFree86. Index: kit/RELNOTES diff -u kit/RELNOTES:1.5 kit/RELNOTES:1.6 --- kit/RELNOTES:1.5 Tue Sep 25 17:25:13 2001 +++ kit/RELNOTES Fri Jun 6 17:49:10 2003 @@ -2,8 +2,31 @@ Release Notes for MagicPoint - Sep 21, 2001 + Jun 5, 2003 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +<<<1.10a>>> + +* Support for Xft2 + fontconfig. If you are not familiar with these words, + please see FAQ and README.xft2 for more information. + +* Support for new directive %tab 0 which can be used to apply a list of + directives to lines that start with a non-tab character. + +* For security reasons, we have changed mgp so that directives that fork a + process are not processed by default. The -U option must be specified in + order to process such directives. + +* Introduced %opaque directive. Please see SYNTAX for detailed information. + +* Support for iso8859-2 encoding for mgp2ps + +* Introduced -X option for mgp2ps to suppress the use of the specified + rendering engine + +* Introduced escape char '\' to display lines that start with '#'. + +* Many bug fixes. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% <<<1.09a>>> 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 Jun 9 05:10:01 2003 @@ -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/mgp.h diff -u kit/mgp.h:1.133 kit/mgp.h:1.134 --- kit/mgp.h:1.133 Wed Apr 16 17:02:55 2003 +++ kit/mgp.h Fri Jun 6 16:18:25 2003 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /* - * $Id: mgp.h,v 1.133 2003/04/16 08:02:55 nishida Exp $ + * $Id: mgp.h,v 1.134 2003/06/06 07:18:25 nishida Exp $ */ #include @@ -696,6 +696,7 @@ extern struct ctrl *ctlalloc1 __P((u_int)); extern void ctlfree __P((struct ctrl *)); extern struct ctrl *ctlcopy __P((struct ctrl *)); +extern struct ctrl *ctlcopy1 __P((struct ctrl *)); extern void debug0 __P((struct ctrl *)); extern void debug1 __P((struct ctrl *)); Index: kit/parse.c diff -u kit/parse.c:1.91 kit/parse.c:1.92 --- kit/parse.c:1.91 Thu May 8 17:31:20 2003 +++ kit/parse.c Fri Jun 6 16:18:25 2003 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /* - * $Id: parse.c,v 1.91 2003/05/08 08:31:20 nishida Exp $ + * $Id: parse.c,v 1.92 2003/06/06 07:18:25 nishida Exp $ */ #include "mgp.h" @@ -460,9 +460,12 @@ } } } - if (buf[0] == '#') continue; +#if 1 /* escape # by backslash */ + if (buf[0] == 0x5c && (buf[1] == 0x5c || buf[1] == 0x23)) + memcpy(&buf[0], &buf[1], strlen(buf)); +#endif if (buf[0] == '%') { /* this is directive */ int pb; @@ -775,6 +778,7 @@ struct ctrl *cp; struct ctrl *cp1; struct ctrl *cp2; + struct ctrl *cpt; char *p; struct ctrl *carryover[MAXPAGE]; @@ -1217,11 +1221,18 @@ ctlcopy(tab_control[tab_depth])); } #else - /* insert CTL_TAB items into the head of the ctrls */ if (tab_control[tab_depth]) { ch = &page_control[page][l]; - ctlinsert(ch, - ctlcopy(tab_control[tab_depth])); + for (cpt = tab_control[tab_depth]; cpt; cpt = cpt->ct_next){ + /* Thses ctrl items should be in CTL_LINESTART */ + if (cpt->ct_op == CTL_IMAGE || cpt->ct_op == CTL_TABPREFIX || + cpt->ct_op == CTL_ICON){ + ctlinsert(&cp1->ct_next, ctlcopy1(cpt)); + cp1 = cp1->ct_next; + } else + /* other ctrl items should be in the head of the ctrls */ + ctlinsert(ch, ctlcopy1(cpt)); + } } #endif @@ -1587,6 +1598,19 @@ } return dst0; +} + +struct ctrl * +ctlcopy1(src) + struct ctrl *src; +{ + struct ctrl *dst; + if (!src) + return NULL; + dst = ctlalloc1(0); + memcpy(dst, src, sizeof(struct ctrl)); + dst->ct_next = NULL; + return dst; } int 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 Jun 9 05:10:03 2003 @@ -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/image/rlelib.c diff -u kit/image/rlelib.c:1.3 kit/image/rlelib.c:1.4 --- kit/image/rlelib.c:1.3 Mon Dec 28 17:23:21 1998 +++ kit/image/rlelib.c Tue Jun 3 04:15:23 2003 @@ -12,7 +12,9 @@ #include #include +#if 0 #include +#endif #include #include "image.h" /* need ZFILE definition */ 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 Jun 9 05:10:04 2003 @@ -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