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 23 05:10:03 1999 @@ -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/Imakefile.in diff -u kit/Imakefile.in:1.48 kit/Imakefile.in:1.49 --- kit/Imakefile.in:1.48 Thu May 27 12:22:45 1999 +++ kit/Imakefile.in Wed Aug 18 21:13:01 1999 @@ -1,4 +1,4 @@ -# $Id: Imakefile.in,v 1.48 1999/05/27 03:22:45 nishida Exp $ +# $Id: Imakefile.in,v 1.49 1999/08/18 12:13:01 kazu Exp $ @SET_MAKE@ srcdir= @srcdir@ @@ -9,7 +9,7 @@ TPOBJS= mgp.o draw.o parse.o plist.o globals.o x11.o font.o background.o \ scanner.o grammar.o postscript.o tfont.o embed.o unimap.o PROBJS= print.o parse.o globals.o x11dummy.o scanner.o grammar.o postscript.o \ - embed.o + embed.o LIBOBJS= @LIBOBJS@ OBJS= ${TPOBJ} ${PROBJS} ${LIBOBJS} LIBS= $(srcdir)/image/libmgpimage.a @@ -68,7 +68,6 @@ SpecialObjectRule(scanner.o,scanner.c, $(DEFS) $(OPTFLAGS)) SpecialObjectRule(grammar.o,grammar.c, $(DEFS) $(OPTFLAGS)) SpecialObjectRule(embed.o,embed.c, $(DEFS) $(OPTFLAGS)) -SpecialObjectRule(unimap.o,unimap.c, $(DEFS) $(OPTFLAGS)) #define PassCDebugFlags #define IHaveSubdirs @@ -100,6 +99,11 @@ $(YACC) -d $(srcdir)/grammar.y mv y.tab.c grammar.c mv y.tab.h tokdefs.h + +# -O2 will work badly... +unimap.o: + $(CC) -c $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) \ + -I$(srcdir) $(DEFS) $(OPTFLAGS) unimap.c # missing libraries memcmp.o: missing/memcmp.c Index: kit/SYNTAX diff -u kit/SYNTAX:1.28 kit/SYNTAX:1.29 --- kit/SYNTAX:1.28 Tue Jun 8 15:39:35 1999 +++ kit/SYNTAX Wed Aug 18 12:18:23 1999 @@ -1,4 +1,4 @@ -$Id: SYNTAX,v 1.28 1999/06/08 06:39:35 nishida Exp $ +$Id: SYNTAX,v 1.29 1999/08/18 03:18:23 itojun Exp $ placement restriction for directives: .mgprc preamble main pages @@ -15,6 +15,10 @@ # Comment lines. + +\ (at the end of line) + Line continuation. Spaces/tabs at the beginning of next line + will be ignored. %size :: size of fonts 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 23 05:10:07 1999 @@ -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/globals.c diff -u kit/globals.c:1.38 kit/globals.c:1.39 --- kit/globals.c:1.38 Sun Jul 4 00:52:43 1999 +++ kit/globals.c Wed Aug 18 12:13:44 1999 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /* - * $Id: globals.c,v 1.38 1999/07/03 15:52:43 nishida Exp $ + * $Id: globals.c,v 1.39 1999/08/18 03:13:44 itojun Exp $ */ #include "mgp.h" @@ -92,7 +92,7 @@ /*CTL*/ { CTL_NOOP, T_VOID, "noop", 4 }, /*CTL*/ { CTL_DEFAULT, T_INT, "default", 7 }, /*CTL*/ { CTL_TAB, T_SP, "tab", 3 }, -/*CTL*/ { CTL_SIZE, T_INT, "size", 4 }, +/*CTL*/ { CTL_SIZE, T_DOUBLE, "size", 4 }, /*CTL*/ { CTL_FORE, T_LONG, "fore", 4 }, /*CTL*/ { CTL_BACK, T_LONG, "back", 4 }, /*CTL*/ { CTL_LEFT, T_VOID, "left", 4 }, Index: kit/mgp.h diff -u kit/mgp.h:1.109 kit/mgp.h:1.110 --- kit/mgp.h:1.109 Sun Jul 4 00:52:44 1999 +++ kit/mgp.h Wed Aug 18 12:13:46 1999 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /* - * $Id: mgp.h,v 1.109 1999/07/03 15:52:44 nishida Exp $ + * $Id: mgp.h,v 1.110 1999/08/18 03:13:46 itojun Exp $ */ #include @@ -329,6 +329,7 @@ #define T_STR2 'C' #define T_INT 'i' #define T_LONG 'l' +#define T_DOUBLE 'f' #define T_SP 'x' #define T_VOID '-' char *ctl_string; Index: kit/parse.c diff -u kit/parse.c:1.76 kit/parse.c:1.78 --- kit/parse.c:1.76 Sat Jun 26 22:05:07 1999 +++ kit/parse.c Wed Aug 18 12:18:24 1999 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /* - * $Id: parse.c,v 1.76 1999/06/26 13:05:07 itojun Exp $ + * $Id: parse.c,v 1.78 1999/08/18 03:18:24 itojun Exp $ */ #include "mgp.h" @@ -252,6 +252,7 @@ int preamble; { char buf[BUFSIZ]; + char buf2[BUFSIZ]; struct ctrl **ch; struct ctrl *cp; struct ctrl *p; @@ -428,7 +429,7 @@ continue; } { - char *p; + char *p, *q; p = buf + strlen(buf); if (buf < p && p[-1] == '\n') { @@ -437,8 +438,13 @@ } while (buf < p && p - buf < sizeof(buf) && p[-1] == '\\') { p--; - if (fgets(p, sizeof(buf) - (p - buf), fp) == NULL) + if (fgets(buf2, sizeof(buf) - (p - buf), fp) == NULL) break; + q = buf2; + /* ignore blanks */ + while (*q && isspace(*q)) + q++; + strncpy(p, q, sizeof(buf) - (p - buf)); p += strlen(p); if (buf < p && p[-1] == '\n') { p--; @@ -786,7 +792,7 @@ tmplong[2] = ctlalloc1(CTL_CCOLOR); get_color(DEFAULT_FORE, &tmplong[2]->ctl_value); tmpint[0] = ctlalloc1(CTL_SIZE); - tmpint[0]->cti_value = DEFAULT_CHARSIZE; + tmpint[0]->ctf_value = DEFAULT_CHARSIZE; tmpint[1] = ctlalloc1(CTL_HGAP); tmpint[1]->cti_value = DEFAULT_HGAP; tmpint[2] = ctlalloc1(CTL_VGAP); @@ -832,7 +838,7 @@ if (!tmpint[i]) continue; cp->ct_next = ctlalloc1(tmpint[i]->ct_op); - cp->ct_next->cti_value = tmpint[i]->cti_value; + cp->ct_next->ct_val = tmpint[i]->ct_val; cp = cp->ct_next; } for (i = 0; i < 10; i++) { @@ -935,7 +941,7 @@ if (!tmpint[i]) continue; cp->ct_next = ctlalloc1(tmpint[i]->ct_op); - cp->ct_next->cti_value = tmpint[i]->cti_value; + cp->ct_next->ct_val = tmpint[i]->ct_val; cp = cp->ct_next; } for (i = 0; i < 10; i++) { @@ -1250,6 +1256,9 @@ case T_LONG: fprintf(stderr, "#%lx", p->ctl_value); break; + case T_DOUBLE: + fprintf(stderr, "#%g", p->ctf_value); + break; case T_VOID: break; case T_SP: @@ -1490,6 +1499,8 @@ return (a->cti_value == b->cti_value) ? 0 : 1; case T_LONG: return (a->ctl_value == b->ctl_value) ? 0 : 1; + case T_DOUBLE: + return (a->ctf_value == b->ctf_value) ? 0 : 1; case T_VOID: return 0; case T_SP: Index: kit/sample/sample.mgp diff -u kit/sample/sample.mgp:1.20 kit/sample/sample.mgp:1.21 --- kit/sample/sample.mgp:1.20 Thu Jun 17 10:46:09 1999 +++ kit/sample/sample.mgp Wed Aug 18 12:18:28 1999 @@ -123,7 +123,7 @@ Hello, this is MagicPoint. I can properly handle the folding opeation of very long line, of course english word-wise. The source code of this line is made up by a single line. This is the next line. Even if the indentation changes, I can handle this! Yey! You can also connect the line using backslash. \ -Yes, UNIX tradition. + Yes, UNIX tradition. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %PAGE