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 Jan 22 05:10:00 2007 @@ -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/FAQ diff -u kit/FAQ:1.11 kit/FAQ:1.12 --- kit/FAQ:1.11 Tue Aug 23 22:58:44 2005 +++ kit/FAQ Tue Jan 16 02:25:09 2007 @@ -131,3 +131,12 @@ Q: Does mgp support freetype2? A: Since mgp supports xft, you can use freetype2 functions with Xft. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +Q: I would like to use non-ASCII characters for filenames in mgp slides + +A: please run mgp with -U option + + + Index: kit/RELNOTES diff -u kit/RELNOTES:1.11 kit/RELNOTES:1.13 --- kit/RELNOTES:1.11 Sat Sep 25 01:42:51 2004 +++ kit/RELNOTES Mon Jan 22 02:54:33 2007 @@ -2,10 +2,20 @@ Release Notes for MagicPoint - Sep 25, 2004 + Jan 23, 2007 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +<<<1.12b>>> + +* add %tsystem directive which might be more stable than %xsystem + +* add -lotate option for newimage + +* allow to use non-ASCI filename in slides (use -U to enable this feature) + +* many bug fixes + <<<1.11b>>> * (bugfix) suppress flickering screen when ctrl key is pressed 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 Jan 22 05:10:01 2007 @@ -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.c diff -u kit/mgp.c:1.142 kit/mgp.c:1.145 --- kit/mgp.c:1.142 Mon Jan 15 00:59:57 2007 +++ kit/mgp.c Mon Jan 22 02:56:01 2007 @@ -26,10 +26,10 @@ * SUCH DAMAGE. */ /* - * $Id: mgp.c,v 1.142 2007/01/14 15:59:57 nishida Exp $ + * $Id: mgp.c,v 1.145 2007/01/21 17:56:01 nishida Exp $ */ -static char *mgp_version = "1.11b (20040925)"; +static char *mgp_version = "1.12a (20070123)"; #include "mgp.h" #ifdef USE_SETLOCALE @@ -734,7 +734,7 @@ fprintf(stderr, "\t-Q : Set background image quality(0-100)\n"); fprintf(stderr, "\t-R: Do not perform automatic reload\n"); fprintf(stderr, "\t-S: Do not process directives that forks process (default)\n"); - fprintf(stderr, "\t-U: Do process directives that forks process (unsecure mode)\n"); + fprintf(stderr, "\t-U: Do process directives that forks process\n\t or allow to use non-ASCII filenames (unsecure mode)\n"); fprintf(stderr, "\t-T : Update timestampfile on page refresh\n"); fprintf(stderr, "\t-P: print stderr from image conversion tools (by default it's discarded)\n"); fprintf(stderr, "\t-V: Be verbose\n"); Index: kit/mgp.spec diff -u kit/mgp.spec:1.4 kit/mgp.spec:1.5 --- kit/mgp.spec:1.4 Sat Sep 25 01:42:51 2004 +++ kit/mgp.spec Mon Jan 22 02:42:00 2007 @@ -1,5 +1,5 @@ %define name magicpoint -%define version 1.11b +%define version 1.12b %define release 1 %define serial 1 %define prefix /usr/X11R6 Index: kit/print.c diff -u kit/print.c:1.108 kit/print.c:1.109 --- kit/print.c:1.108 Sun Jan 7 19:30:46 2007 +++ kit/print.c Sun Jan 21 18:35:57 2007 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /* - * $Id: print.c,v 1.108 2007/01/07 10:30:46 nishida Exp $ + * $Id: print.c,v 1.109 2007/01/21 09:35:57 nishida Exp $ */ /* * Paper size selection code is based on psutil.c by Angus J. C. Duggan @@ -612,7 +612,7 @@ fprintf(fp, " WIDTH -1 mul 0 rlineto closepath eofill stroke\n"); fprintf(fp, "} def\n"); - /* ypos = ypos - (charsize * (1 + vert_gap / 100)) */ + /* ypos = ypos - (charsize * (1 + vert_gap / 100)) + little margin */ fprintf(fp, "/NL {\n"); fprintf(fp, " charsize imgsize gt\n"); fprintf(fp, " ymax ymin sub /csize exch def\n"); @@ -621,6 +621,7 @@ fprintf(fp, " { vertgap 100 div csize mul imgsize add }\n"); fprintf(fp, " ifelse\n"); fprintf(fp, " ypos exch sub /ypos exch def\n"); + fprintf(fp, " HEIGHT 90 div ypos exch sub /ypos exch def\n"); fprintf(fp, "} bind def\n"); /* show with line wrapping */ @@ -1136,12 +1137,7 @@ break; } fprintf(fp, "/xpos xpos %d add def\n", tabxprefix ? tabxprefix:xprefix); -#if 0 fprintf(fp, "xpos yypos ymax sub moveto\n"); -#else - /* XXX, put a litte margin for text drawing. very ugly */ - fprintf(fp, "xpos yypos ymax sub charsize 10 div add moveto\n"); -#endif for (i = 0; i < ntextpool; i++) { if (textpool[i].text) { @@ -1536,7 +1532,11 @@ /* by A.Ito 14 Jul. 2000 */ /* placeholder */ imagepool[nimagepool].image = NULL; +#if 0 imagepool[nimagepool].target_text = ntextpool-1; +#else + imagepool[nimagepool].target_text = nimagepool; +#endif nimagepool++; } 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 Jan 22 05:10:01 2007 @@ -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 Jan 22 05:10:01 2007 @@ -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/sample.mgp diff -u kit/sample/sample.mgp:1.31 kit/sample/sample.mgp:1.32 --- kit/sample/sample.mgp:1.31 Mon Jan 15 01:18:09 2007 +++ kit/sample/sample.mgp Sun Jan 21 19:15:32 2007 @@ -261,17 +261,28 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %PAGE -New Functions from 1.12a +New Features in Recent Versions + + Supersript and subscript + You can use superscript and subscript like +%setsup 65 25 65, cont +H +%cont, sub +2 +%cont +O, Ca +%cont, sup +2+ %tsystem directive - If %xsystem does not work properly on your system, please try to use %tsystem + If %xsystem does not work properly on your system, please try to use %tsystem instead %center %tsystem "xclock -geometry %30x30+25+60 -update 1 -bg white -fg blue -hands green" %left Image rotation You can rotate your image with newimage directive -%center, newimage -xscrzoom 20 -rotate 90 "cloud.jpg" +%center, newimage -xscrzoom 15 -rotate 90 "cloud.jpg" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %PAGE %bgrad 0 0 256 0 0 "skyblue" "white" Index: kit/sample/v6header.gif