diff -urNP ../siag-3.3.6/ChangeLog ./ChangeLog --- ../siag-3.3.6/ChangeLog Tue May 16 11:28:57 2000 +++ ./ChangeLog Thu May 18 11:13:28 2000 @@ -1,4 +1,7 @@ +000517 Added siagrun which was missing from the distribution. + Released 3.3.7. + 000516 Replaced ~/.siag/applications.scm with ~/.siag/applications.sh, which is used also by XedPlus, XFiler et al. This way all applications use the same terminal, same help browser and so on. diff -urNP ../siag-3.3.6/TODO ./TODO --- ../siag-3.3.6/TODO Tue May 9 12:11:33 2000 +++ ./TODO Wed May 17 10:58:08 2000 @@ -1,12 +1,4 @@ -New features for PW: - - Nicer looking ruler - - Tab stops - - Columns - - Layout view - - Undo - - Formula editor using TeX - Plugins should go into $prefix/lib rather than $prefix/libexec in order to be FHS compliant. diff -urNP ../siag-3.3.6/common/Makefile.am ./common/Makefile.am --- ../siag-3.3.6/common/Makefile.am Tue May 9 12:05:59 2000 +++ ./common/Makefile.am Thu May 18 11:12:58 2000 @@ -27,7 +27,7 @@ common_SCRIPTS = any2xpm readpfa -EXTRA_DIST = $(common_DATA) $(common_SCRIPTS) rgb.c rgb.txt \ +EXTRA_DIST = $(bin_SCRIPTS) $(common_DATA) $(common_SCRIPTS) rgb.c rgb.txt \ newdict mkt1cfg siag.magic siag.dfmext kdeinst t1lib.config: mkt1cfg diff -urNP ../siag-3.3.6/common/Makefile.in ./common/Makefile.in --- ../siag-3.3.6/common/Makefile.in Tue May 16 11:46:11 2000 +++ ./common/Makefile.in Thu May 18 12:53:54 2000 @@ -105,7 +105,7 @@ common_SCRIPTS = any2xpm readpfa -EXTRA_DIST = $(common_DATA) $(common_SCRIPTS) rgb.c rgb.txt newdict mkt1cfg siag.magic siag.dfmext kdeinst +EXTRA_DIST = $(bin_SCRIPTS) $(common_DATA) $(common_SCRIPTS) rgb.c rgb.txt newdict mkt1cfg siag.magic siag.dfmext kdeinst mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h diff -urNP ../siag-3.3.6/common/siagrun ./common/siagrun --- ../siag-3.3.6/common/siagrun Thu Jan 1 01:00:00 1970 +++ ./common/siagrun Tue May 16 10:42:48 2000 @@ -0,0 +1,22 @@ +#!/bin/sh + +if [ ! -f $HOME/.siag/applications.sh ]; then + cat > $HOME/.siag/applications.sh << EOF +viewer=gvu +lpr=lpr +editor=xedplus +help=siaghelp +filer=xfiler +terminal=xterm +calculator=xcalc +EOF + +fi + +. $HOME/.siag/applications.sh + +CMD=$1 +shift +#echo "eval \$$CMD $@ || exit 1" +eval \$$CMD $@ || exit 1 + diff -urNP ../siag-3.3.6/configure ./configure --- ../siag-3.3.6/configure Mon May 8 10:17:35 2000 +++ ./configure Thu May 18 11:23:28 2000 @@ -706,7 +706,7 @@ PACKAGE=siag -VERSION=3.3.6 +VERSION=3.3.7 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } diff -urNP ../siag-3.3.6/configure.in ./configure.in --- ../siag-3.3.6/configure.in Sat May 6 18:23:04 2000 +++ ./configure.in Wed May 17 10:59:11 2000 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(README) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(siag, 3.3.6) +AM_INIT_AUTOMAKE(siag, 3.3.7) dnl Set of available languages dnl ALL_LINGUAS="" diff -urNP ../siag-3.3.6/xcommon/Table.c ./xcommon/Table.c --- ../siag-3.3.6/xcommon/Table.c Sat May 6 08:18:01 2000 +++ ./xcommon/Table.c Thu May 18 07:29:13 2000 @@ -429,7 +429,7 @@ int font_index, color_index; unsigned long color; int x_pos, y_pos; - unsigned int text_height, text_width; + int text_height, text_width; int cw, ch; int ct; int fmt; @@ -501,14 +501,18 @@ x_base, y_base, x_pos, y_pos, rcp, -1, zoom); cfree(rcp); - XSetForeground(dpy, grid_gc, tw->table.black); + + /* grid lines */ + XSetForeground(dpy, grid_gc, tw->table.grey); if (tw->table.grid_lines) { int x1 = x_base, y1 = y_base; int x2 = x_base+zoom*(cw-1), y2 = y_base+zoom*(ch-1); XDrawLine(dpy, scribble, grid_gc, x1, y2, x2, y2); XDrawLine(dpy, scribble, grid_gc, x2, y2, x2, y1); } + /* these lines are from the format */ + XSetForeground(dpy, grid_gc, tw->table.black); if (siagfmt & BORDER_LEFT) XDrawLine(dpy, scribble, grid_gc, x_base, y_base, x_base, y_base+zoom*(ch-2)); @@ -524,10 +528,18 @@ XDrawLine(dpy, scribble, grid_gc, x_base, y_base+zoom*(ch-2), x_base+zoom*(cw-2), y_base+zoom*(ch-2)); - XSetForeground(dpy, grid_gc, - WhitePixelOfScreen(XtScreen(w))); + + /* makebelieve 3D */ if (tw->table.threeD) { XDrawLine(dpy, scribble, grid_gc, + x_base, y_base+zoom*(ch-1), + x_base+zoom*(cw-1), y_base+zoom*(ch-1)); + XDrawLine(dpy, scribble, grid_gc, + x_base+zoom*(cw-1), y_base, + x_base+zoom*(cw-1), y_base+zoom*(ch-1)); + XSetForeground(dpy, grid_gc, + WhitePixelOfScreen(XtScreen(w))); + XDrawLine(dpy, scribble, grid_gc, x_base, y_base, x_base, y_base+zoom*(ch-2)); XDrawLine(dpy, scribble, grid_gc, @@ -796,7 +808,7 @@ tw->table.grey = screen_color.pixel; tw->table.clear_gc = get_gc(w, tw->table.white, tw->table.black); tw->table.cell_gc = get_gc(w, tw->table.black, tw->table.white); - tw->table.grid_gc = get_gc(w, tw->table.black, tw->table.white); + tw->table.grid_gc = get_gc(w, tw->table.grey, tw->table.white); #if 1 /* this is too much */ XSetLineAttributes(XtDisplay(w), tw->table.grid_gc, 0, LineSolid, CapButt, JoinMiter);