diff -urNP ../siag-3.3.9/ChangeLog ./ChangeLog
--- ../siag-3.3.9/ChangeLog Thu Jun 15 08:25:33 2000
+++ ./ChangeLog Sun Jun 18 22:35:15 2000
@@ -1,4 +1,13 @@
+000618 Egon: Load and save HTML and load MS Powerpoint using pptHtml.
+ Load Magicpoint as plaintext using the new converter mgptotxt.
+ Keyboard control. Docs for keybindings and file formats slightly
+ unbroken.
+ Siag: Moved only_space to common/common.c.
+ Released 3.3.10.
+
+000616 Egon: Load and save plain text.
+
000615 Fixed a bunch of compiler warnings in Xfiler.
Released 3.3.9.
diff -urNP ../siag-3.3.9/Nws/Makefile.in ./Nws/Makefile.in
--- ../siag-3.3.9/Nws/Makefile.in Thu Jun 15 08:25:45 2000
+++ ./Nws/Makefile.in Sun Jun 18 22:46:15 2000
@@ -221,47 +221,6 @@
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
-Base.o: Base.c PopText.h BaseP.h Base.h cvt.h dimdefP.h BaseConstP.h \
- BaseConst.h BaseCompP.h BaseComp.h Init.h utils.h Traverse.h
-BaseComp.o: BaseComp.c PopText.h BaseCompP.h BaseComp.h cvt.h dimdefP.h \
- BaseConstP.h BaseConst.h Init.h utils.h Traverse.h
-BaseConst.o: BaseConst.c PopText.h BaseConstP.h BaseConst.h cvt.h \
- dimdefP.h BaseCompP.h BaseComp.h Init.h utils.h Traverse.h
-BaseME.o: BaseME.c BaseMEP.h BaseME.h cvt.h dimdefP.h Init.h utils.h
-Button.o: Button.c utils.h cvt.h misc.h cvt.h ButtonP.h SButtonP.h \
- BaseP.h Base.h dimdefP.h SButton.h Button.h Init.h
-CheckME.o: CheckME.c CheckMEP.h LabelMEP.h BaseMEP.h BaseME.h cvt.h \
- dimdefP.h LabelME.h CheckME.h Init.h utils.h mdoff.xpm mdon.xpm \
- mroff.xpm mron.xpm mcoff.xpm mcon.xpm mchoff.xpm mchon.xpm \
- mc2on.xpm mc2off.xpm mcron.xpm mcroff.xpm
-LabelME.o: LabelME.c LabelMEP.h BaseMEP.h BaseME.h cvt.h dimdefP.h \
- LabelME.h Init.h utils.h misc.h
-LineME.o: LineME.c LineMEP.h BaseMEP.h BaseME.h cvt.h dimdefP.h LineME.h \
- Init.h
-MBButton.o: MBButton.c MenuBarP.h RowP.h BaseConstP.h BaseConst.h cvt.h \
- dimdefP.h Row.h MenuBar.h Init.h MenuP.h Menu.h BaseMEP.h \
- BaseME.h MBButtonP.h LabelMEP.h BaseMEP.h LabelME.h MBButton.h
-Menu.o: Menu.c MenuP.h Menu.h cvt.h dimdefP.h BaseMEP.h BaseME.h Init.h \
- utils.h cvt.h
-MenuBar.o: MenuBar.c MenuBarP.h RowP.h BaseConstP.h BaseConst.h cvt.h \
- dimdefP.h Row.h MenuBar.h Init.h MBButtonP.h LabelMEP.h \
- BaseMEP.h BaseME.h LabelME.h MBButton.h
-MenuButton.o: MenuButton.c MenuButtonP.h ButtonP.h SButtonP.h BaseP.h \
- Base.h cvt.h dimdefP.h SButton.h Button.h MenuButton.h Init.h
-NwsVendor.o: NwsVendor.c NwsVendor.h NwsVendorP.h
-PopText.o: PopText.c PopTextP.h PopText.h Init.h misc.h
-Row.o: Row.c RowP.h BaseConstP.h BaseConst.h cvt.h dimdefP.h Row.h \
- Init.h misc.h Traverse.h
-SButton.o: SButton.c SButtonP.h BaseP.h Base.h cvt.h dimdefP.h SButton.h \
- Init.h
-SubME.o: SubME.c MenuP.h Menu.h cvt.h dimdefP.h BaseMEP.h BaseME.h \
- Init.h SubMEP.h LabelMEP.h BaseMEP.h LabelME.h SubME.h utils.h \
- trion.xpm trioff.xpm
-Traverse.o: Traverse.c Traverse.h BaseConstP.h BaseConst.h cvt.h \
- dimdefP.h BaseCompP.h BaseComp.h
-cvt.o: cvt.c cvt.h
-misc.o: misc.c misc.h
-utils.o: utils.c utils.h cvt.h BaseMEP.h BaseME.h dimdefP.h
info-am:
info: info-am
diff -urNP ../siag-3.3.9/common/Makefile.in ./common/Makefile.in
--- ../siag-3.3.9/common/Makefile.in Thu Jun 15 08:25:41 2000
+++ ./common/Makefile.in Sun Jun 18 22:46:13 2000
@@ -360,12 +360,6 @@
|| exit 1; \
fi; \
done
-cmalloc.o: cmalloc.c cmalloc.h
-common.o: common.c ../config.h cmalloc.h common.h traceme.h
-fonts.o: fonts.c common.h oldfonts.h fonts.h
-globals.o: globals.c
-ps.o: ps.c ps.h
-richchar.o: richchar.c cmalloc.h richchar.h traceme.h
info-am:
info: info-recursive
diff -urNP ../siag-3.3.9/common/common.c ./common/common.c
--- ../siag-3.3.9/common/common.c Fri May 26 07:56:53 2000
+++ ./common/common.c Sun Jun 18 14:55:55 2000
@@ -519,3 +519,9 @@
return pid;
}
+int only_space(char *p)
+{
+ while (*p && isspace(*p)) p++;
+ return (*p == '\0');
+}
+
diff -urNP ../siag-3.3.9/common/common.h ./common/common.h
--- ../siag-3.3.9/common/common.h Fri May 26 07:57:00 2000
+++ ./common/common.h Sun Jun 18 14:56:19 2000
@@ -47,6 +47,7 @@
extern char *translate(char *);
extern void quotecpy(char *, char *, char *);
extern pid_t spawn(const char *);
+extern int only_space(char *);
#undef _
#define _ translate
diff -urNP ../siag-3.3.9/configure ./configure
--- ../siag-3.3.9/configure Thu Jun 15 07:04:47 2000
+++ ./configure Sun Jun 18 22:43:50 2000
@@ -706,7 +706,7 @@
PACKAGE=siag
-VERSION=3.3.9
+VERSION=3.3.10
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.9/configure.in ./configure.in
--- ../siag-3.3.9/configure.in Thu Jun 15 07:04:36 2000
+++ ./configure.in Thu Jun 15 16:40:35 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.9)
+AM_INIT_AUTOMAKE(siag, 3.3.10)
dnl Set of available languages
dnl ALL_LINGUAS=""
diff -urNP ../siag-3.3.9/egon/Makefile.am ./egon/Makefile.am
--- ../siag-3.3.9/egon/Makefile.am Tue Jun 13 22:18:11 2000
+++ ./egon/Makefile.am Sun Jun 18 14:50:32 2000
@@ -1,6 +1,8 @@
SUBDIRS = docs examples
+bin_SCRIPTS = mgptotxt
+
noinst_LIBRARIES = libegon.a
libegon_a_SOURCES = main.c railway.c matrix.c fileio.c cmds.c \
@@ -15,5 +17,5 @@
scmdir = $(datadir)/siag/egon
scm_DATA = animator.scm egon.scm menu.scm external.load external.save
-EXTRA_DIST = $(scm_DATA)
+EXTRA_DIST = $(bin_SCRIPTS) $(scm_DATA)
diff -urNP ../siag-3.3.9/egon/Makefile.in ./egon/Makefile.in
--- ../siag-3.3.9/egon/Makefile.in Thu Jun 15 08:25:51 2000
+++ ./egon/Makefile.in Sun Jun 18 22:46:23 2000
@@ -85,6 +85,8 @@
SUBDIRS = docs examples
+bin_SCRIPTS = mgptotxt
+
noinst_LIBRARIES = libegon.a
libegon_a_SOURCES = main.c railway.c matrix.c fileio.c cmds.c buffer.c fileio_egon.c fileio_c.c fileio_scm.c fileio_html.c fileio_mgp.c fileio_txt.c siodi.c guilei.c tcli.c pythoni.c
@@ -96,7 +98,7 @@
scmdir = $(datadir)/siag/egon
scm_DATA = animator.scm egon.scm menu.scm external.load external.save
-EXTRA_DIST = $(scm_DATA)
+EXTRA_DIST = $(bin_SCRIPTS) $(scm_DATA)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
@@ -116,6 +118,8 @@
fileio_egon.o fileio_c.o fileio_scm.o fileio_html.o fileio_mgp.o \
fileio_txt.o siodi.o guilei.o tcli.o pythoni.o
AR = ar
+SCRIPTS = $(bin_SCRIPTS)
+
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
@@ -178,6 +182,25 @@
$(AR) cru libegon.a $(libegon_a_OBJECTS) $(libegon_a_LIBADD)
$(RANLIB) libegon.a
+install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
+ if test -f $$p; then \
+ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ else if test -f $(srcdir)/$$p; then \
+ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ else :; fi; fi; \
+ done
+
+uninstall-binSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ list='$(bin_SCRIPTS)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ done
+
install-scmDATA: $(scm_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(scmdir)
@@ -311,21 +334,6 @@
|| exit 1; \
fi; \
done
-buffer.o: buffer.c egon.h ../common/fonts.h types.h ../common/common.h \
- ../common/cmalloc.h
-cmds.o: cmds.c ../common/common.h ../common/cmalloc.h ../common/plugin.h \
- ../siod/siod.h egon.h ../common/fonts.h types.h \
- user_interface.h
-fileio.o: fileio.c egon.h ../common/fonts.h types.h ../common/common.h \
- ../common/cmalloc.h user_interface.h
-fileio_html.o: fileio_html.c egon.h ../common/fonts.h types.h \
- ../common/common.h
-fileio_mgp.o: fileio_mgp.c egon.h ../common/fonts.h types.h \
- ../common/common.h
-fileio_ps.o: fileio_ps.c egon.h ../common/fonts.h types.h \
- ../common/common.h
-fileio_txt.o: fileio_txt.c egon.h ../common/fonts.h types.h \
- ../common/common.h
info-am:
info: info-recursive
@@ -335,7 +343,7 @@
check: check-recursive
installcheck-am:
installcheck: installcheck-recursive
-install-exec-am:
+install-exec-am: install-binSCRIPTS
install-exec: install-exec-recursive
install-data-am: install-scmDATA
@@ -344,15 +352,15 @@
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-recursive
-uninstall-am: uninstall-scmDATA
+uninstall-am: uninstall-binSCRIPTS uninstall-scmDATA
uninstall: uninstall-recursive
-all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS)
+all-am: Makefile $(LIBRARIES) $(SCRIPTS) $(DATA) $(HEADERS)
all-redirect: all-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs: installdirs-recursive
installdirs-am:
- $(mkinstalldirs) $(DESTDIR)$(scmdir)
+ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(scmdir)
mostlyclean-generic:
@@ -390,8 +398,9 @@
.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile uninstall-scmDATA install-scmDATA \
-install-data-recursive uninstall-data-recursive install-exec-recursive \
+maintainer-clean-compile uninstall-binSCRIPTS install-binSCRIPTS \
+uninstall-scmDATA install-scmDATA install-data-recursive \
+uninstall-data-recursive install-exec-recursive \
uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
all-recursive check-recursive installcheck-recursive info-recursive \
dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
diff -urNP ../siag-3.3.9/egon/docs/TODO ./egon/docs/TODO
--- ../siag-3.3.9/egon/docs/TODO Mon Oct 26 15:40:59 1998
+++ ./egon/docs/TODO Sun Jun 18 20:14:35 2000
@@ -5,24 +5,16 @@
Make the -play option start the program in mode ANI_PLAY.
-Printing.
-
-Full-screen animations.
-
The C format should also save any pixmaps, so that they can be
compiled into the application.
Make an extremely small demo program to show how an X program can get
animation capabilities with hardly any code of its own.
-In the future, I will want several scenes
-and so on, but that will just have to wait.
-
To begin with, there can be only one animation window going at a time.
Move object in list
Change tick time and move if needed
-Save as animated GIF (implemented! Requires netpbm and transgif.)
Selection (how?)
Repeat a *sequence* of pixmaps as many times as it takes
diff -urNP ../siag-3.3.9/egon/docs/fileformats.html ./egon/docs/fileformats.html
--- ../siag-3.3.9/egon/docs/fileformats.html Thu Apr 8 23:14:02 1999
+++ ./egon/docs/fileformats.html Sun Jun 18 20:13:10 2000
@@ -7,8 +7,7 @@
File Formats
-Egon Animator has support for several file formats, intended for various
-purposes.
+Egon Animator has support for the following file formats:
- Egon Animator
@@ -26,18 +25,31 @@
- The animation can be saved as a multi-image GIF file, which
when displayed in a WWW browser like Netscape performs
the animation without using Egon Animator. Egon cannot
- load animated GIF files.
+ load animated GIF files. Saving animated GIFs requires
+ the netpbm package and the gifmerge program, neither
+ of which is part of Siag Office but must be installed
+ separately.
- Postscript
-
- Egon Animator is not yet, but will in time be, able to
- save Postscript images of the animation scene, with
- DSC comments and all to make the resulting files
- post-processable. Normally, this code goes straight
+
- Egon Animator can
+ save Postscript images of the animation scene.
+ Normally, this code goes straight
to the printer or to Ghostview for previewing, but
it can also be saved in a file.
+
- Text
+
- Plaintext files can be read and written.
+
- HTML
+
- Hypertext Markup Language can be read and written.
+
- Magic Point
+
- Presentations created for the Magic Point program
+ can be read.
+
- MS Powerpoint
+
- Presentations created for MS Powerpoint can be read
+ if the pptHtml program is available. pptHtml is part of
+ xlHtml by Steve Grubb, linux_4ever@yahoo.com.
-Ulric Eriksson - February 1997 - ulric@siag.nu
+Ulric Eriksson - June 2000 - ulric@siag.nu