diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/::README iv-3.1-g++2.7.2/::README --- iv-3.1/::README Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/::README Tue Apr 2 23:51:59 1996 @@ -0,0 +1,9 @@ +Short README about the README's: + +::README This one. +README The original README from 3.1.tar +README.linux Obsolete README for linux aout DLL libraries + from iv-3.1l.2-diff +README.iv-3.1-g++2.7.2 Read this to build InterViews! + +ht, Tue Apr 2 23:51:53 MET DST 1996 diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/README.iv-3.1-g++2.7.2 iv-3.1-g++2.7.2/README.iv-3.1-g++2.7.2 --- iv-3.1/README.iv-3.1-g++2.7.2 Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/README.iv-3.1-g++2.7.2 Tue Apr 2 23:48:01 1996 @@ -0,0 +1,193 @@ + + README for + iv-3.1-g++2.7.2-diffs (diffs against 3.1.tar.gz) + iv-3.1-g++2.7.2.tar.gz (full source, readily patched) + + +These are patches to compile InterViews 3.1 with gcc 2.7.2 on Digital +Unix 3.2c (formerly DEC Alpha OSF/1) and on ix86 Linux with ELF (Debian +distribution in my case). + +It should be possible to adapt it with minor effort to other +architectures too. + +To install the patches, you need the InterViews 3.1 sources. I used +3.1.tar.gz (2067715 Bytes) - sorry, I don't remember the ftp source. I +think .../comp/X11/contrib/toolkits/InterViews/3.1.tar.Z (3771112 Bytes, +1992/12/15) is the same. + +For your convenience, I've uploaded the full source tree too, with all +patches applied (iv-3.1-g++2.7.2.tar.gz). You may use this if you don't +have 3.1.tar.gz yet; to build InterViews, start with step 4 below. + +This patchfile includes various patches I found on different sites and +in the newsgroup comp.windows.interviews (see below) as well as some +patches by myself. + +To install, perform the following steps: + +1. make a subdirectory to + build InterViews: mkdir iv-src + cd iv-src + +2. unpack 3.1.tar.{gz,Z}: gtar xvzf 3.1.tar.gz + +3. install the patches: patch -E -p0 < some_path/iv-3.1-g++2.7.2-diffs +3.a Search for rejected patches, + but there shouldn't be any find . -name \*.rej -print + If there are any, try to + fix it manually. +3.b Remove original files find . -name \*.orig -print | xargs rm -f + +4. build it: cd iv + export CPU=`make CPU` + nohup make World & + + Warning: you should use GNU make here. If you don't want to use GNU make, + you have to change iv/src/config/InterViews/local.def (search for + DependTarget). + +5. log out, go home, drink coffee or so. The build process takes some + time, about half an hour or so dependend on your machine. + +6. Inspect nohup.out for errors. Yes, I know, there are lots of + warnings. If you've the time to correct them, I'd appreciate it. + +7. Warning: you have build InterViews with shared libraries. To test + some program in iv/src/bin/..., you have to set LD_LIBRARY_PATH to + .../iv/lib/IV/ and .../iv/lib/Unidraw/, or you + have to install it first. + +8. Install it: make install + + If you havent' modified anything, it will be installed in + /usr/local/interviews. + + You have to make two symbolic links manually: + Alpha: cd /usr/local/lib + ln -s ../interviews/lib/libIV.so . + ln -s ../interviews/lib/libUnidraw.so . + + Linux: cd /lib # as root + rm -f libIV* # remove old symlinks + rm -f libUnidraw* # if there are any + cd /usr/local/lib + ln -s ../interviews/lib/libIV.so.3.1 . + ln -s ../interviews/lib/libUnidraw.so.3.1 . + ln -s libIV.so.3.1 libIV.so + ln -s libUnidraw.so.3.1 libUnidraw.so + ldconfig # as root + + On Linux, if you have Slackware 2.1, your old InterViews installation + is in /usr/interviews, and there are symlinks from /usr/X11/bin/... + to /usr/interviews. You can simply + cd /usr + rm -rf interviews + ln -s local/interviews . + to use your new installation, and then you don't have to set your + PATH (step 9). Don't know how or if InterViews is installed in Slackware + anymore. + +9. Set your PATH and MANPATH: PATH=$PATH:/usr/local/interviews/bin + MANPATH=$MANPATH:/usr/local/interviews/man + +10. Test it (ibuild, idraw). + +11. If you need static libraries (e.g. for debugging purposes), you can + can do a ``make World.noshared'' instead of ``make World'' in step 4 + above. You could install it with ``make install.noshared'', but then + you will get statically linked binaries (huge!) installed. Instead, + install the libraries only: + cd iv/src/lib + make install.noshared + The libs and binaries are build in .../ALPHA.noshared or + .../LINUX.noshared. Note that the non-shared libs are not used in + the linking stage if you have installed the shared libs except you + link with option -static. + +12. If you find some bugs in InterViews and want to debug them, you can + do ``make World.debug'' to build InterViews with debugging info. + The lib's and binaries are then build in .../ALPHA.debug (or + .../LINUX.debug); the binaries will be linked statically. + +If something goes wrong, you are on your own. The lib's work for me now, +and I don't have the time to do any support. Good luck. + +I used the following patches before doing my own work: + +iv-3.1-DEC-Alpha.diff: Patches to compile InterViews with DEC cxx. + This was the base for my changes in + iv/src/config/InterViews/iv-alpha.cf +iv-3.1-g++-3.1.tar: Patches for g++ 2.5.8 (Don't remember if I used it.) +comp.windows.interviews: A posting by for + DEC/cxx regarding a problem with idraw. +iv-3.1l.2-diffs: Patches for Linux with gcc 2.5.x. See the + README.linux for details. This README tells you + that some scripts aren't build correctly; this + is fixed now. + The aout DLL (dynamic link library) + configuration was deleted for gcc 2.7.2(ELF) + now; but there are some parts in Imakefiles + left. +comp.windows.interviews: A posting by Ned Danieley + regarding a compilation problem with + struct XDisplay. +Patches by sgi: I've included the diffs between 3.1.tar.Z and + ftp.sgi.com:~ftp/graphics/interviews/3.2.a.tar.Z + (3893050 Bytes, Jun 27 1994). I don't know if + this is _really_ version 3.2 - there was no + README included. + +My own changes: + +o Fiddling with "#pragma interface" / "#pragma implementation", because there + was a change in the interpretation of this commands (see gcc 2.6.x - Manual + Page 163: + > In versions of GNU C++ prior to 2.6.0 `allclass.h' was treated as an + > implementation file whenever you would include it from `allclass.cc' + > even if you never specified `#pragma implementation'. This was deemed + > to be more trouble than it was worth, however, and disabled' + + This lead to ``unresolved symbols'' or ``multiply defined symbols'' at the + linking stage. + +o Modifications in iv-alpha.cf, gcc.def, local.def, TIFF.def and some + other places: + + There were some bugs when some modules where compiled with + optimization on Alpha. I've turned off optimization for these files + (see iv/src/lib/IV/Imakefile). + +o For the step from gcc 2.6.3 to gcc 2.7.2: + - small changes at the config files + - some changes because of the changed ``for'' semantic (many warnings + left) + - changes in iv-linux.cf for ELF shared libraries + +Bugs and TODO: + +o Check iv/src/config/InterViews/{iv-alpha.cf,iv-linux.cf,gcc.def,local.def} + if you want to change something. + +o There are some warnings about wrong function call parameters at + compilation time. + +o Many warnings about the local variable scope in for loops left over. + Someone should fix this. + +o There are problems on alpha if optimization is turned on (see + gcc.def): e.g. file selector boxes don't show files, but only a grey + pattern. Perhaps a compiler error? Or some bug that shows only with + optimization? I didn't analyse it. + Just found the module (xcanvas.o in libIV) that made the broken file + selector box - so I turned off optimization for it (.../IV/Imakefile) + and on for the rest (.../config/InterViews/gcc.def). + Would be fine if someone could analyse these faults. + +Good luck to build InterViews. If you are new to InterViews, you should +perhaps try to use Fresco, the follow-up project to InterViews, I think +by the X consortium. For me, it's too late. + +Herbert Thielen , +Wed Apr 5 11:39:56 MET DST 1995 (for 2.6.3) +Tue Apr 2 22:55:33 MET DST 1996 (for 2.7.2) diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/README.linux iv-3.1-g++2.7.2/README.linux --- iv-3.1/README.linux Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/README.linux Tue Apr 4 13:51:00 1995 @@ -0,0 +1,142 @@ + + README for iv-3.1l.2-bin.tar.gz + +The binary distribution of InterViews with shared libraries must be +extracted in / + +cd / +gzip -dc iv-3.1l.2-bin.tar.gz | tar xpf - + +Then, either add /usr/local/interviews/lib to /etc/ld.so.conf or make +links for the sharable images + +$ ln -s /usr/local/interviews/lib/libIV.so.3.1.2 /lib +$ ln -s /usr/local/interviews/lib/libUnidraw.so.3.1.2 /lib + +then run ldconfig + +$ ldconfig -v + +If you don't make links, be sure that you have ldconfig 1.4.3 or +newer, 1.3 did not work properly when I tried. + +======================================================================= +YOU NEED libgr.so.1 TO RUN INTERVIEWS. IF YOU DONT HAVE IT YET, GET IT. +======================================================================= + +(See below for instruction to build a library with tiff support included) + +_______________________________________________________________________________ + + + README for InterViews 3.1 for Linux + +The file "iv-3.1l.2.diffs" contains patches for the standard 3.1.tar.Z +distribution of InterViews. To apply the patches, cd to the directory +that contains iv/ (NOT into iv/) and execute "patch -p [-s] < +iv-3.1l.2.diffs". The patches combine four groups of patches + +1) Patches supplied by Mike Stump in + pub/contrib/g++/iv-3.1-g++-3.1.tar.Z@interviews.stanford.edu + +2) Patches from Fritz Heinrichmeyer . + These patches introduce "#pragma interface"/"#pragma implementation" + statements for g++ as "space savers". The script for rudimentary + shared library support supplied with these patches has not been used. + +3) Patches for iv-linux.cf, some Imakefiles, etc. and jump.* files + for Linux shared library support. jump.* files have been made + as described in "Using DLL Tools With Linux" and should be + "update save" (extra space allocated etc.). + + The rules for building shared Linux libraries have been modelled as + the "builtin" rules for SunOS. Thus, you can say `make World' to get + everything built with shared libraries or `make World.noshared' for + static libraries and executables. + +4) Patches to improve iv-3.1l and Interviews (see below). + Contributions have been made by + Kevin Martin + + +Other changes: +-------------- + +I have omitted the TIFF objects from libIV.a and added -ltiff to +Ld_libIV (see iv-linux.cf). This allows you to update to new versions +of the TIFF library without having to take care of proper link order +etc. + +A sharable libtiff.a is available as part of the libgr package on the +usual servers. libgr is included in the Slackware distribution (I +didn't check other distributions). + +If, for some reason, you do not want to install libgr.so, you can +build your own version of libIV that includes tiff support (patches +contributed by Kevin Martin ). Just change "#define +HasLibTIFF YES" in iv-linux.cf to "NO". The iv-3.1l.2-diffs include +jump files for both versions. Jump files are compatible, i.e., you can +still run the distribution binaries with your libIV+tiff library +(others, however can't run your binaries unless you install libgr +after all and link with "-ltiff -lIV"). + + +Interviews fixes +---------------- + +Interviews 3.1 has never been officially updated (as far as I know). +So what to do with inofficial fixes? I can't ignore fixes sent to me, +as this makes the libraries less usable and yet I can't simply include +them as this makes the libraries incompatible. I have chosen to make +all patches depend on a global variable +iv_3_1l_inofficial_iv_fixes_enabled. The library includes a definition +for that variable (initialized to 0) that you can replace by your own +definition (thanks to dynamic linking). I.e., in your main.c you +include + +int iv_3_1l_inofficial_iv_fixes_enabled = 1; + +if you want the inofficial changes to take effect (this has been done +for all the distributed binaries). Changing the value by replacing the +variable instead of assigning a new value in "main" allows me to make +fixes for global constructors depend on the value. Defining "int +iv_3_1l_inofficial_iv_fixes_enabled = 0;" in the library asures that +the libraries are compatible to InterViews on other systems by +default. I.e., InterViews bugs will appear on your Linux box as on +your Sun, etc. with unpatched IV 3.1 libraries. + +There is no fix for script-building with GCC cpp. I.e., if you use +the GCC preprocessor as /lib/cpp (as I do), building the scripts in +src/bin/scripts fails and you have to do it by hand. + + +Adresses +-------- + +libIV.so.3.1.1 and libUnidraw.so.3.1.1 occupy the address space +allocated to them according the document "Using DLL Tools With Linux". +I tried to contact Peter MacDonald who has registered this address +space, but he does not respond to my mails. + +I have been told by Kevin Martin who wrote to him +earlier, that Peter MacDonald does not intend to release shared InterViews +libraries. So there should be no problem. + + +Michael Lipp + + + +---------------------------------------------------------------------------- +Changes in iv-3.1l.2 + + * Support compilation with TIFF. + + * Library names aren't absolute any more. + + * iv_3_1l_inofficial_iv_fixes_enabled mechanism (see above). + + * Default kit restored to SMFKit (default in 3.1 distribution) + + * A fix for a src/lib/InterViews/tiff.c colormap bug + diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/Imakefile iv-3.1-g++2.7.2/iv/src/Imakefile --- iv-3.1/iv/src/Imakefile Wed Aug 21 17:54:48 1991 +++ iv-3.1-g++2.7.2/iv/src/Imakefile Tue Apr 2 13:51:52 1996 @@ -10,3 +10,12 @@ man MakeInSubdirs($(SUBDIRS)) + +#if HasLinuxSharedLibraries +clean:: @@\ + @echo Cleaning in linux-dll @@\ + @cd linux-dll; \ @@\ + for d in *; do \ @@\ + (cd $$d; $(RM_CMD) size.nm *.s *~) \ @@\ + done +#endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/alert/main.c iv-3.1-g++2.7.2/iv/src/bin/alert/main.c --- iv-3.1/iv/src/bin/alert/main.c Mon Jul 6 18:16:31 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/alert/main.c Tue Apr 2 13:51:53 1996 @@ -20,6 +20,8 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +int iv_3_1l_inofficial_iv_fixes_enabled = 1; + /* * alert - displays a message in a dialog box */ diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/dclock/clocktime.c iv-3.1-g++2.7.2/iv/src/bin/dclock/clocktime.c --- iv-3.1/iv/src/bin/dclock/clocktime.c Sat Dec 12 05:32:28 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/dclock/clocktime.c Tue Apr 2 18:38:11 1996 @@ -24,6 +24,9 @@ * time related functions for digital clock */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "clocktime.h" #include @@ -32,7 +35,7 @@ #endif Clock::Clock () { -#if defined(sun) && OSMajorVersion >= 5 +#if (defined(sun) && OSMajorVersion >= 5) || defined(__FTX) gettimeofday(&gmt); #else gettimeofday(&gmt, 0); @@ -41,7 +44,7 @@ } int Clock::NextTick () { -#if defined(sun) && OSMajorVersion >= 5 +#if defined(sun) && OSMajorVersion >= 5 || defined(__FTX) gettimeofday(&gmt); #else gettimeofday(&gmt, 0); @@ -52,14 +55,10 @@ void Clock::GetTime (char* date, int& h, int& m, int& s) { struct tm local; -#if defined(hpux) || defined(AIXV3) +#if defined(hpux) || defined(AIXV3) || defined(__DECCXX) || defined(linux) local = * localtime((time_t*) &gmt.tv_sec); #else -#ifdef __DECCXX - local = * localtime((time_t*)&gmt.tv_sec); -#else local = * localtime(&gmt.tv_sec); -#endif #endif h = local.tm_hour; m = local.tm_min; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/dclock/clocktime.h iv-3.1-g++2.7.2/iv/src/bin/dclock/clocktime.h --- iv-3.1/iv/src/bin/dclock/clocktime.h Thu Sep 28 01:37:36 1989 +++ iv-3.1-g++2.7.2/iv/src/bin/dclock/clocktime.h Tue Apr 2 13:51:53 1996 @@ -27,7 +27,16 @@ #ifndef clocktime_h #define clocktime_h +#ifdef __GNUG__ +#pragma interface +#endif + +#include #include +#if defined(__FTX) +/* sys/time.h includes sys/types.h, grab clean version first */ +#include +#endif #include class Clock { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/dclock/data.c iv-3.1-g++2.7.2/iv/src/bin/dclock/data.c --- iv-3.1/iv/src/bin/dclock/data.c Fri Jul 19 21:13:49 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/dclock/data.c Tue Apr 2 13:51:53 1996 @@ -25,6 +25,9 @@ */ #include "dclock.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "data.h" #include "segment.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/dclock/data.h iv-3.1-g++2.7.2/iv/src/bin/dclock/data.h --- iv-3.1/iv/src/bin/dclock/data.h Fri Sep 15 23:29:54 1989 +++ iv-3.1-g++2.7.2/iv/src/bin/dclock/data.h Tue Apr 2 13:51:53 1996 @@ -27,6 +27,10 @@ #ifndef data_h #define data_h +#ifdef __GNUG__ +#pragma interface +#endif + static const int QKEY = 193; enum TMode { CIVIL, MIL }; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/dclock/dclock.c iv-3.1-g++2.7.2/iv/src/bin/dclock/dclock.c --- iv-3.1/iv/src/bin/dclock/dclock.c Wed May 8 03:03:38 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/dclock/dclock.c Tue Apr 2 13:51:53 1996 @@ -20,10 +20,15 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +int iv_3_1l_inofficial_iv_fixes_enabled = 1; + /* * dclock - digital clock */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "dclock.h" #include "dface.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/dclock/dclock.h iv-3.1-g++2.7.2/iv/src/bin/dclock/dclock.h --- iv-3.1/iv/src/bin/dclock/dclock.h Fri Sep 15 23:29:56 1989 +++ iv-3.1-g++2.7.2/iv/src/bin/dclock/dclock.h Tue Apr 2 13:51:53 1996 @@ -27,6 +27,10 @@ #ifndef dclock_h #define dclock_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/dclock/dface.c iv-3.1-g++2.7.2/iv/src/bin/dclock/dface.c --- iv-3.1/iv/src/bin/dclock/dface.c Mon Mar 2 18:07:01 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/dclock/dface.c Tue Apr 2 13:51:53 1996 @@ -27,6 +27,9 @@ #include #include #include "dclock.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "dface.h" #include "digit.h" #include "clocktime.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/dclock/dface.h iv-3.1-g++2.7.2/iv/src/bin/dclock/dface.h --- iv-3.1/iv/src/bin/dclock/dface.h Wed May 8 03:03:17 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/dclock/dface.h Tue Apr 2 13:51:54 1996 @@ -27,6 +27,12 @@ #ifndef dface_h #define dface_h +#ifdef __GNUG__ +#pragma interface +#endif + +class IOHandler; + struct CharPoints { int count; Coord x[12]; @@ -78,7 +84,7 @@ char text[50]; } date; - class IOHandler* tick; + IOHandler* tick; }; #endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/dclock/digit.c iv-3.1-g++2.7.2/iv/src/bin/dclock/digit.c --- iv-3.1/iv/src/bin/dclock/digit.c Fri Sep 15 23:30:00 1989 +++ iv-3.1-g++2.7.2/iv/src/bin/dclock/digit.c Tue Apr 2 13:51:54 1996 @@ -25,6 +25,9 @@ */ #include "dclock.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "digit.h" #include "segment.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/dclock/digit.h iv-3.1-g++2.7.2/iv/src/bin/dclock/digit.h --- iv-3.1/iv/src/bin/dclock/digit.h Fri Sep 15 23:30:02 1989 +++ iv-3.1-g++2.7.2/iv/src/bin/dclock/digit.h Tue Apr 2 13:51:54 1996 @@ -27,6 +27,10 @@ #ifndef digit_h #define digit_h +#ifdef __GNUG__ +#pragma interface +#endif + class Digit { public : Digit(float, float); diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/dclock/segment.c iv-3.1-g++2.7.2/iv/src/bin/dclock/segment.c --- iv-3.1/iv/src/bin/dclock/segment.c Mon Mar 4 18:56:58 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/dclock/segment.c Tue Apr 2 13:51:54 1996 @@ -25,6 +25,9 @@ */ #include "dclock.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "segment.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/dclock/segment.h iv-3.1-g++2.7.2/iv/src/bin/dclock/segment.h --- iv-3.1/iv/src/bin/dclock/segment.h Fri Mar 27 18:45:34 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/dclock/segment.h Tue Apr 2 13:51:54 1996 @@ -27,6 +27,10 @@ #ifndef segment_h #define segment_h +#ifdef __GNUG__ +#pragma interface +#endif + typedef unsigned int Seg; enum { SegA, SegB, SegC, SegD, SegE, SegF, SegG }; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/Application.c iv-3.1-g++2.7.2/iv/src/bin/doc/Application.c --- iv-3.1/iv/src/bin/doc/Application.c Fri Sep 11 18:20:48 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/Application.c Tue Apr 2 13:51:54 1996 @@ -24,6 +24,9 @@ * Application */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "Application.h" #include "Document.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/Application.h iv-3.1-g++2.7.2/iv/src/bin/doc/Application.h --- iv-3.1/iv/src/bin/doc/Application.h Sat Apr 11 07:28:39 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/Application.h Tue Apr 2 13:51:54 1996 @@ -27,6 +27,10 @@ #ifndef Application_h #define Application_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class ApplicationViewerInfo; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/Command.c iv-3.1-g++2.7.2/iv/src/bin/doc/Command.c --- iv-3.1/iv/src/bin/doc/Command.c Fri Aug 23 18:06:50 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/Command.c Tue Apr 2 13:51:54 1996 @@ -24,6 +24,9 @@ * Command -- acts on an ItemView through a DocumentViewer */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "Command.h" #include "DocViewer.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/Command.h iv-3.1-g++2.7.2/iv/src/bin/doc/Command.h --- iv-3.1/iv/src/bin/doc/Command.h Fri Apr 12 08:20:55 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/Command.h Tue Apr 2 13:51:55 1996 @@ -27,6 +27,10 @@ #ifndef Command_h #define Command_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class DocumentViewer; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/CounterItem.c iv-3.1-g++2.7.2/iv/src/bin/doc/CounterItem.c --- iv-3.1/iv/src/bin/doc/CounterItem.c Sat Apr 11 07:28:44 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/CounterItem.c Tue Apr 2 13:51:55 1996 @@ -24,6 +24,9 @@ * CounterItem */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "CounterItem.h" #include "CounterView.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/CounterItem.h iv-3.1-g++2.7.2/iv/src/bin/doc/CounterItem.h --- iv-3.1/iv/src/bin/doc/CounterItem.h Tue Jun 9 19:47:08 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/CounterItem.h Tue Apr 2 13:51:55 1996 @@ -27,6 +27,10 @@ #ifndef CounterItem_h #define CounterItem_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "Item.h" class CounterView; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/CounterView.c iv-3.1-g++2.7.2/iv/src/bin/doc/CounterView.c --- iv-3.1/iv/src/bin/doc/CounterView.c Sat Apr 11 07:28:46 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/CounterView.c Tue Apr 2 13:51:55 1996 @@ -24,6 +24,9 @@ * CounterView */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "CounterView.h" #include "Document.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/CounterView.h iv-3.1-g++2.7.2/iv/src/bin/doc/CounterView.h --- iv-3.1/iv/src/bin/doc/CounterView.h Fri Apr 12 08:21:01 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/CounterView.h Tue Apr 2 13:51:55 1996 @@ -27,6 +27,10 @@ #ifndef CounterView_h #define CounterView_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ItemView.h" class Patch; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/DialogMgr.c iv-3.1-g++2.7.2/iv/src/bin/doc/DialogMgr.c --- iv-3.1/iv/src/bin/doc/DialogMgr.c Sat Apr 11 07:28:48 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/DialogMgr.c Tue Apr 2 13:51:55 1996 @@ -24,8 +24,11 @@ * DialogManager */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "DialogMgr.h" -#include "dialogs.h" +#include "doc-dialogs.h" #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/DialogMgr.h iv-3.1-g++2.7.2/iv/src/bin/doc/DialogMgr.h --- iv-3.1/iv/src/bin/doc/DialogMgr.h Tue Jun 9 19:53:40 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/DialogMgr.h Tue Apr 2 13:51:55 1996 @@ -27,6 +27,10 @@ #ifndef DialogManager_h #define DialogManager_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class ChooserInfo_List; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/DocViewer.c iv-3.1-g++2.7.2/iv/src/bin/doc/DocViewer.c --- iv-3.1/iv/src/bin/doc/DocViewer.c Thu Nov 26 05:46:57 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/DocViewer.c Tue Apr 2 13:51:55 1996 @@ -24,6 +24,9 @@ * DocumentViewer */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "DocViewer.h" #include "Application.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/DocViewer.h iv-3.1-g++2.7.2/iv/src/bin/doc/DocViewer.h --- iv-3.1/iv/src/bin/doc/DocViewer.h Sat Apr 11 07:28:53 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/DocViewer.h Tue Apr 2 13:51:56 1996 @@ -27,6 +27,10 @@ #ifndef DocumentViewer_h #define DocumentViewer_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/Document.c iv-3.1-g++2.7.2/iv/src/bin/doc/Document.c --- iv-3.1/iv/src/bin/doc/Document.c Sat Dec 12 00:36:37 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/Document.c Tue Apr 2 13:51:56 1996 @@ -24,6 +24,9 @@ * Document */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "Document.h" #include "Application.h" @@ -451,7 +454,7 @@ } else { long count = _families->count(); for (long i = 0; i < count; ++i) { - FontFamilyInfo& info = _families->item_ref(0); + FontFamilyInfo& info = _families->item_ref(i); if (strcmp(info._name, name) == 0) { break; } diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/Document.h iv-3.1-g++2.7.2/iv/src/bin/doc/Document.h --- iv-3.1/iv/src/bin/doc/Document.h Tue Jun 9 19:49:59 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/Document.h Tue Apr 2 13:51:56 1996 @@ -27,6 +27,10 @@ #ifndef Document_h #define Document_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/Figure.c iv-3.1-g++2.7.2/iv/src/bin/doc/Figure.c --- iv-3.1/iv/src/bin/doc/Figure.c Sat Apr 11 07:29:00 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/Figure.c Tue Apr 2 13:51:56 1996 @@ -24,6 +24,9 @@ * planar figures */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "Figure.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/Figure.h iv-3.1-g++2.7.2/iv/src/bin/doc/Figure.h --- iv-3.1/iv/src/bin/doc/Figure.h Wed May 8 00:01:00 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/Figure.h Tue Apr 2 13:51:56 1996 @@ -27,6 +27,10 @@ #ifndef Figure_defined #define Figure_defined +#ifdef __GNUG__ +#pragma interface +#endif + #include class Brush; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/FloatItem.c iv-3.1-g++2.7.2/iv/src/bin/doc/FloatItem.c --- iv-3.1/iv/src/bin/doc/FloatItem.c Sat Apr 11 07:29:03 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/FloatItem.c Tue Apr 2 13:51:56 1996 @@ -24,6 +24,9 @@ * FloatItem */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "FloatItem.h" #include "FloatView.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/FloatItem.h iv-3.1-g++2.7.2/iv/src/bin/doc/FloatItem.h --- iv-3.1/iv/src/bin/doc/FloatItem.h Mon Jul 13 19:15:38 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/FloatItem.h Tue Apr 2 13:51:56 1996 @@ -27,6 +27,10 @@ #ifndef FloatItem_h #define FloatItem_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "Item.h" class TextItem; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/FloatView.c iv-3.1-g++2.7.2/iv/src/bin/doc/FloatView.c --- iv-3.1/iv/src/bin/doc/FloatView.c Wed May 27 00:37:49 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/FloatView.c Tue Apr 2 13:51:56 1996 @@ -24,6 +24,9 @@ * FloatView */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "FloatView.h" #include "Document.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/FloatView.h iv-3.1-g++2.7.2/iv/src/bin/doc/FloatView.h --- iv-3.1/iv/src/bin/doc/FloatView.h Fri Apr 12 08:21:19 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/FloatView.h Tue Apr 2 13:51:57 1996 @@ -27,6 +27,10 @@ #ifndef FloatView_h #define FloatView_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ItemView.h" class Patch; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/IdrawImage.c iv-3.1-g++2.7.2/iv/src/bin/doc/IdrawImage.c --- iv-3.1/iv/src/bin/doc/IdrawImage.c Sat Apr 11 07:29:07 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/IdrawImage.c Tue Apr 2 13:51:57 1996 @@ -26,6 +26,9 @@ * IdrawImage - read an idraw drawing from a file */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "IdrawImage.h" #include "Figure.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/IdrawImage.h iv-3.1-g++2.7.2/iv/src/bin/doc/IdrawImage.h --- iv-3.1/iv/src/bin/doc/IdrawImage.h Mon May 6 22:28:22 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/IdrawImage.h Tue Apr 2 13:51:57 1996 @@ -29,6 +29,10 @@ #ifndef IdrawImage_h #define IdrawImage_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/Imakefile iv-3.1-g++2.7.2/iv/src/bin/doc/Imakefile --- iv-3.1/iv/src/bin/doc/Imakefile Sat Apr 11 02:13:20 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/Imakefile Tue Apr 2 13:51:57 1996 @@ -62,7 +62,7 @@ Obj(PageBorder) Obj(PageButton) -Obj(dialogs) +Obj(doc-dialogs) Obj(doc-composition) Obj(doc-deck) Obj(doc-listener) diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/InsertMarker.c iv-3.1-g++2.7.2/iv/src/bin/doc/InsertMarker.c --- iv-3.1/iv/src/bin/doc/InsertMarker.c Fri Jun 19 22:07:48 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/InsertMarker.c Tue Apr 2 13:51:57 1996 @@ -22,6 +22,9 @@ * OF THIS SOFTWARE. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "InsertMarker.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/InsertMarker.h iv-3.1-g++2.7.2/iv/src/bin/doc/InsertMarker.h --- iv-3.1/iv/src/bin/doc/InsertMarker.h Fri Jun 19 22:07:49 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/InsertMarker.h Tue Apr 2 13:51:57 1996 @@ -29,6 +29,10 @@ #ifndef iv_Insertmarker_h #define iv_Insertmarker_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/Item.c iv-3.1-g++2.7.2/iv/src/bin/doc/Item.c --- iv-3.1/iv/src/bin/doc/Item.c Fri Aug 23 17:34:08 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/Item.c Tue Apr 2 13:51:57 1996 @@ -24,6 +24,9 @@ * Item */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "Item.h" #include "Document.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/Item.h iv-3.1-g++2.7.2/iv/src/bin/doc/Item.h --- iv-3.1/iv/src/bin/doc/Item.h Wed May 8 00:01:15 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/Item.h Tue Apr 2 13:51:57 1996 @@ -27,6 +27,10 @@ #ifndef Item_h #define Item_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class istream; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/ItemView.c iv-3.1-g++2.7.2/iv/src/bin/doc/ItemView.c --- iv-3.1/iv/src/bin/doc/ItemView.c Sat Apr 11 07:29:30 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/ItemView.c Tue Apr 2 13:51:58 1996 @@ -24,6 +24,9 @@ * ItemView */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ItemView.h" #include "Item.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/ItemView.h iv-3.1-g++2.7.2/iv/src/bin/doc/ItemView.h --- iv-3.1/iv/src/bin/doc/ItemView.h Sat Apr 11 07:29:35 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/ItemView.h Tue Apr 2 13:51:58 1996 @@ -27,6 +27,10 @@ #ifndef ItemView_h #define ItemView_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/Keymap.c iv-3.1-g++2.7.2/iv/src/bin/doc/Keymap.c --- iv-3.1/iv/src/bin/doc/Keymap.c Sat Apr 11 07:29:37 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/Keymap.c Tue Apr 2 13:51:58 1996 @@ -24,6 +24,9 @@ * Keymap for doc */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "Keymap.h" #include "Document.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/Keymap.h iv-3.1-g++2.7.2/iv/src/bin/doc/Keymap.h --- iv-3.1/iv/src/bin/doc/Keymap.h Mon Jul 13 19:19:21 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/Keymap.h Tue Apr 2 13:51:58 1996 @@ -27,6 +27,10 @@ #ifndef Keymap_h #define Keymap_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class DocKeymapInfo_List; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/LabelItem.c iv-3.1-g++2.7.2/iv/src/bin/doc/LabelItem.c --- iv-3.1/iv/src/bin/doc/LabelItem.c Sat Apr 11 07:29:39 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/LabelItem.c Tue Apr 2 13:51:58 1996 @@ -24,6 +24,9 @@ * LabelItem */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "LabelItem.h" #include "LabelView.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/LabelItem.h iv-3.1-g++2.7.2/iv/src/bin/doc/LabelItem.h --- iv-3.1/iv/src/bin/doc/LabelItem.h Tue Jun 9 19:53:45 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/LabelItem.h Tue Apr 2 13:51:58 1996 @@ -27,6 +27,10 @@ #ifndef LabelItem_h #define LabelItem_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "Item.h" class LabelView; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/LabelView.c iv-3.1-g++2.7.2/iv/src/bin/doc/LabelView.c --- iv-3.1/iv/src/bin/doc/LabelView.c Sat Apr 11 07:29:41 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/LabelView.c Tue Apr 2 13:51:58 1996 @@ -24,6 +24,9 @@ * LabelView */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "LabelView.h" #include "Document.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/LabelView.h iv-3.1-g++2.7.2/iv/src/bin/doc/LabelView.h --- iv-3.1/iv/src/bin/doc/LabelView.h Fri Apr 12 08:21:39 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/LabelView.h Tue Apr 2 13:51:58 1996 @@ -27,6 +27,10 @@ #ifndef LabelView_h #define LabelView_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ItemView.h" class Patch; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/Leader.c iv-3.1-g++2.7.2/iv/src/bin/doc/Leader.c --- iv-3.1/iv/src/bin/doc/Leader.c Sat Apr 11 07:29:44 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/Leader.c Tue Apr 2 13:51:58 1996 @@ -26,6 +26,9 @@ * Leader - visible filler glyph */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "Leader.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/Leader.h iv-3.1-g++2.7.2/iv/src/bin/doc/Leader.h --- iv-3.1/iv/src/bin/doc/Leader.h Sat Apr 11 07:29:46 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/Leader.h Tue Apr 2 13:51:59 1996 @@ -29,6 +29,10 @@ #ifndef iv_leader_h #define iv_leader_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Leader : public Glyph { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/Menus.c iv-3.1-g++2.7.2/iv/src/bin/doc/Menus.c --- iv-3.1/iv/src/bin/doc/Menus.c Wed May 13 00:31:15 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/Menus.c Tue Apr 2 13:51:59 1996 @@ -27,6 +27,9 @@ #include "Command.h" #include "Document.h" #include "DocViewer.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "Menus.h" #include "TextItem.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/Menus.h iv-3.1-g++2.7.2/iv/src/bin/doc/Menus.h --- iv-3.1/iv/src/bin/doc/Menus.h Mon Oct 14 18:10:02 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/Menus.h Tue Apr 2 13:51:59 1996 @@ -27,6 +27,10 @@ #ifndef Menus_h #define Menus_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/MinipageView.c iv-3.1-g++2.7.2/iv/src/bin/doc/MinipageView.c --- iv-3.1/iv/src/bin/doc/MinipageView.c Mon Jul 13 19:19:24 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/MinipageView.c Tue Apr 2 13:51:59 1996 @@ -24,6 +24,9 @@ * MinipageView */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "MinipageView.h" #include "TextItem.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/MinipageView.h iv-3.1-g++2.7.2/iv/src/bin/doc/MinipageView.h --- iv-3.1/iv/src/bin/doc/MinipageView.h Sat Apr 11 07:29:52 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/MinipageView.h Tue Apr 2 13:51:59 1996 @@ -27,6 +27,10 @@ #ifndef MiniPageView_h #define MiniPageView_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "TextView.h" class Composition; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/NoPrint.c iv-3.1-g++2.7.2/iv/src/bin/doc/NoPrint.c --- iv-3.1/iv/src/bin/doc/NoPrint.c Fri Aug 23 17:34:16 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/NoPrint.c Tue Apr 2 13:51:59 1996 @@ -24,6 +24,9 @@ * NoPrint */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "NoPrint.h" NoPrint::NoPrint(Glyph* body) : MonoGlyph(body) { } diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/NoPrint.h iv-3.1-g++2.7.2/iv/src/bin/doc/NoPrint.h --- iv-3.1/iv/src/bin/doc/NoPrint.h Wed May 8 00:01:32 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/NoPrint.h Tue Apr 2 13:51:59 1996 @@ -27,6 +27,10 @@ #ifndef NoPrint_h #define NoPrint_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class NoPrint : public MonoGlyph { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/PGM_Image.c iv-3.1-g++2.7.2/iv/src/bin/doc/PGM_Image.c --- iv-3.1/iv/src/bin/doc/PGM_Image.c Fri Aug 23 17:34:17 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/PGM_Image.c Tue Apr 2 13:51:59 1996 @@ -26,6 +26,9 @@ * PGM_Image - read a Raster from a file containing postscript from pgmtops */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "PGM_Image.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/PGM_Image.h iv-3.1-g++2.7.2/iv/src/bin/doc/PGM_Image.h --- iv-3.1/iv/src/bin/doc/PGM_Image.h Fri Apr 12 08:21:51 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/PGM_Image.h Tue Apr 2 13:52:00 1996 @@ -29,6 +29,10 @@ #ifndef PGM_Image_h #define PGM_Image_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/PPM_Image.c iv-3.1-g++2.7.2/iv/src/bin/doc/PPM_Image.c --- iv-3.1/iv/src/bin/doc/PPM_Image.c Fri Aug 23 17:34:18 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/PPM_Image.c Tue Apr 2 13:52:00 1996 @@ -26,6 +26,9 @@ * PPM_Image - read a Raster from a file containing postscript from ppmtops */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "PPM_Image.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/PPM_Image.h iv-3.1-g++2.7.2/iv/src/bin/doc/PPM_Image.h --- iv-3.1/iv/src/bin/doc/PPM_Image.h Fri Apr 12 08:21:54 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/PPM_Image.h Tue Apr 2 13:52:00 1996 @@ -29,6 +29,10 @@ #ifndef PPM_Image_h #define PPM_Image_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/PSFigItem.c iv-3.1-g++2.7.2/iv/src/bin/doc/PSFigItem.c --- iv-3.1/iv/src/bin/doc/PSFigItem.c Mon Jun 8 09:29:46 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/PSFigItem.c Tue Apr 2 13:52:00 1996 @@ -24,6 +24,9 @@ * PSFigItem */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "PSFigItem.h" #include "Document.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/PSFigItem.h iv-3.1-g++2.7.2/iv/src/bin/doc/PSFigItem.h --- iv-3.1/iv/src/bin/doc/PSFigItem.h Tue Jun 9 19:53:48 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/PSFigItem.h Tue Apr 2 13:52:00 1996 @@ -27,6 +27,10 @@ #ifndef PSFigItem_h #define PSFigItem_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "Item.h" enum PSFigViewMode { PSDraft, PSFinal }; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/PSFigView.c iv-3.1-g++2.7.2/iv/src/bin/doc/PSFigView.c --- iv-3.1/iv/src/bin/doc/PSFigView.c Mon Jul 13 19:19:26 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/PSFigView.c Tue Apr 2 13:52:00 1996 @@ -24,6 +24,9 @@ * PSFigView */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "PSFigView.h" #include "Application.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/PSFigView.h iv-3.1-g++2.7.2/iv/src/bin/doc/PSFigView.h --- iv-3.1/iv/src/bin/doc/PSFigView.h Fri Apr 12 08:22:00 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/PSFigView.h Tue Apr 2 13:52:00 1996 @@ -27,6 +27,10 @@ #ifndef PSFigView_h #define PSFigView_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ItemView.h" #include "PSFigItem.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/PageBorder.c iv-3.1-g++2.7.2/iv/src/bin/doc/PageBorder.c --- iv-3.1/iv/src/bin/doc/PageBorder.c Mon Oct 14 18:10:04 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/PageBorder.c Tue Apr 2 13:52:00 1996 @@ -24,6 +24,9 @@ * PageBorder - a fancy Border */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "PageBorder.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/PageBorder.h iv-3.1-g++2.7.2/iv/src/bin/doc/PageBorder.h --- iv-3.1/iv/src/bin/doc/PageBorder.h Mon Oct 14 18:10:05 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/PageBorder.h Tue Apr 2 13:52:01 1996 @@ -27,6 +27,10 @@ #ifndef ivlook_pageborder_h #define ivlook_pageborder_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Color; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/PageButton.c iv-3.1-g++2.7.2/iv/src/bin/doc/PageButton.c --- iv-3.1/iv/src/bin/doc/PageButton.c Sat Apr 11 07:30:08 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/PageButton.c Tue Apr 2 13:52:01 1996 @@ -24,6 +24,9 @@ * page button Telltale */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "PageButton.h" #include "doc-target.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/PageButton.h iv-3.1-g++2.7.2/iv/src/bin/doc/PageButton.h --- iv-3.1/iv/src/bin/doc/PageButton.h Sat Apr 11 07:30:15 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/PageButton.h Tue Apr 2 13:52:01 1996 @@ -27,6 +27,10 @@ #ifndef ivlook_pagebutton_h #define ivlook_pagebutton_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Bitmap; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/PagenoItem.c iv-3.1-g++2.7.2/iv/src/bin/doc/PagenoItem.c --- iv-3.1/iv/src/bin/doc/PagenoItem.c Sat Apr 11 07:30:32 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/PagenoItem.c Tue Apr 2 13:52:01 1996 @@ -24,6 +24,9 @@ * PagenumberItem */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "PagenoItem.h" #include "PagenoView.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/PagenoItem.h iv-3.1-g++2.7.2/iv/src/bin/doc/PagenoItem.h --- iv-3.1/iv/src/bin/doc/PagenoItem.h Mon Jul 13 19:19:17 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/PagenoItem.h Tue Apr 2 13:52:01 1996 @@ -27,6 +27,10 @@ #ifndef PagenumberItem_h #define PagenumberItem_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "Item.h" class PagenumberView; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/PagenoView.c iv-3.1-g++2.7.2/iv/src/bin/doc/PagenoView.c --- iv-3.1/iv/src/bin/doc/PagenoView.c Wed May 27 00:17:15 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/PagenoView.c Tue Apr 2 13:52:01 1996 @@ -24,6 +24,9 @@ * PagenumberView */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "PagenoView.h" #include "Document.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/PagenoView.h iv-3.1-g++2.7.2/iv/src/bin/doc/PagenoView.h --- iv-3.1/iv/src/bin/doc/PagenoView.h Fri May 17 23:05:18 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/PagenoView.h Tue Apr 2 13:52:01 1996 @@ -27,6 +27,10 @@ #ifndef PagenumberView_h #define PagenumberView_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ItemView.h" class Patch; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/PagingView.c iv-3.1-g++2.7.2/iv/src/bin/doc/PagingView.c --- iv-3.1/iv/src/bin/doc/PagingView.c Mon Jul 13 19:19:27 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/PagingView.c Tue Apr 2 13:52:01 1996 @@ -24,6 +24,9 @@ * PagingView */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "PagingView.h" #include "Command.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/PagingView.h iv-3.1-g++2.7.2/iv/src/bin/doc/PagingView.h --- iv-3.1/iv/src/bin/doc/PagingView.h Wed May 8 00:01:56 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/PagingView.h Tue Apr 2 13:52:02 1996 @@ -27,6 +27,10 @@ #ifndef PagingView_h #define PagingView_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "TextView.h" class Composition; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/RefItem.c iv-3.1-g++2.7.2/iv/src/bin/doc/RefItem.c --- iv-3.1/iv/src/bin/doc/RefItem.c Sat Apr 11 07:30:37 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/RefItem.c Tue Apr 2 13:52:02 1996 @@ -24,6 +24,9 @@ * RefItem */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "RefItem.h" #include "RefView.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/RefItem.h iv-3.1-g++2.7.2/iv/src/bin/doc/RefItem.h --- iv-3.1/iv/src/bin/doc/RefItem.h Tue Jun 9 19:53:53 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/RefItem.h Tue Apr 2 13:52:02 1996 @@ -27,6 +27,10 @@ #ifndef RefItem_h #define RefItem_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "Item.h" class RefView; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/RefView.c iv-3.1-g++2.7.2/iv/src/bin/doc/RefView.c --- iv-3.1/iv/src/bin/doc/RefView.c Sat Apr 11 07:30:39 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/RefView.c Tue Apr 2 13:52:02 1996 @@ -24,6 +24,9 @@ * RefView */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "RefView.h" #include "Document.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/RefView.h iv-3.1-g++2.7.2/iv/src/bin/doc/RefView.h --- iv-3.1/iv/src/bin/doc/RefView.h Fri Apr 12 08:22:30 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/RefView.h Tue Apr 2 13:52:02 1996 @@ -27,6 +27,10 @@ #ifndef RefView_h #define RefView_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ItemView.h" class Patch; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/TabularItem.c iv-3.1-g++2.7.2/iv/src/bin/doc/TabularItem.c --- iv-3.1/iv/src/bin/doc/TabularItem.c Sat Apr 11 07:30:41 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/TabularItem.c Tue Apr 2 13:52:02 1996 @@ -24,6 +24,9 @@ * TabularItem */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "TabularItem.h" #include "Document.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/TabularItem.h iv-3.1-g++2.7.2/iv/src/bin/doc/TabularItem.h --- iv-3.1/iv/src/bin/doc/TabularItem.h Tue Jun 9 19:53:55 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/TabularItem.h Tue Apr 2 13:52:02 1996 @@ -27,6 +27,10 @@ #ifndef TabularItem_h #define TabularItem_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "Item.h" class CellInfo_List; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/TabularView.c iv-3.1-g++2.7.2/iv/src/bin/doc/TabularView.c --- iv-3.1/iv/src/bin/doc/TabularView.c Mon Jul 13 19:19:28 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/TabularView.c Tue Apr 2 13:52:02 1996 @@ -24,6 +24,9 @@ * TabularView */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "TabularView.h" #include "Document.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/TabularView.h iv-3.1-g++2.7.2/iv/src/bin/doc/TabularView.h --- iv-3.1/iv/src/bin/doc/TabularView.h Sat Apr 11 07:30:47 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/TabularView.h Tue Apr 2 13:52:03 1996 @@ -27,6 +27,10 @@ #ifndef TabularView_h #define TabularView_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ItemView.h" class TabularItem; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/TextItem.c iv-3.1-g++2.7.2/iv/src/bin/doc/TextItem.c --- iv-3.1/iv/src/bin/doc/TextItem.c Mon Jul 13 19:19:30 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/TextItem.c Tue Apr 2 13:52:03 1996 @@ -24,6 +24,9 @@ * TextItem */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "TextItem.h" #include "Document.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/TextItem.h iv-3.1-g++2.7.2/iv/src/bin/doc/TextItem.h --- iv-3.1/iv/src/bin/doc/TextItem.h Wed May 8 00:02:13 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/TextItem.h Tue Apr 2 13:52:03 1996 @@ -27,6 +27,10 @@ #ifndef TextItem_h #define TextItem_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "Item.h" class TextView; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/TextView.c iv-3.1-g++2.7.2/iv/src/bin/doc/TextView.c --- iv-3.1/iv/src/bin/doc/TextView.c Sat Apr 11 07:30:51 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/TextView.c Tue Apr 2 13:52:03 1996 @@ -24,6 +24,9 @@ * TextView */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "TextView.h" #include "Application.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/TextView.h iv-3.1-g++2.7.2/iv/src/bin/doc/TextView.h --- iv-3.1/iv/src/bin/doc/TextView.h Wed May 8 00:02:17 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/TextView.h Tue Apr 2 13:52:03 1996 @@ -27,6 +27,10 @@ #ifndef TextView_h #define TextView_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ItemView.h" class TextItem; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/codes.h iv-3.1-g++2.7.2/iv/src/bin/doc/codes.h --- iv-3.1/iv/src/bin/doc/codes.h Mon Oct 14 18:10:17 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/codes.h Tue Apr 2 13:52:03 1996 @@ -23,6 +23,10 @@ #ifndef codes_h #define codes_h +#ifdef __GNUG__ +#pragma interface +#endif + /* * special TeX-like formatting 'characters' * (control characters with high bit set) diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/dialogs.c iv-3.1-g++2.7.2/iv/src/bin/doc/dialogs.c --- iv-3.1/iv/src/bin/doc/dialogs.c Fri Sep 4 22:39:33 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/dialogs.c Thu Jan 1 01:00:00 1970 @@ -1,234 +0,0 @@ -/* - * Copyright (c) 1987-1992 Stanford University - * Copyright (c) 1991-1992 Silicon Graphics, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and - * its documentation for any purpose is hereby granted without fee, provided - * that (i) the above copyright notices and this permission notice appear in - * all copies of the software and related documentation, and (ii) the names of - * Stanford and Silicon Graphics may not be used in any advertising or - * publicity relating to the software without the specific, prior written - * permission of Stanford and Silicon Graphics. - * - * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, - * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY - * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - * - * IN NO EVENT SHALL STANFORD OR SILICON GRAPHICS BE LIABLE FOR - * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, - * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF - * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THIS SOFTWARE. - */ - -#include "dialogs.h" -#include -#include -#include -#include -#include -#include -#include -#include - -Chooser::Chooser(const char* name, const char* prompt) { - Style* s = new Style(Session::instance()->style()); - s->attribute("name", name); - s->attribute("subcaption", prompt); - chooser_ = DialogKit::instance()->file_chooser(".", s, nil); - Resource::ref(chooser_); - style_ = s; - Resource::ref(style_); -} - -Chooser::~Chooser() { - Resource::unref(chooser_); - Resource::unref(style_); -} - -const char* Chooser::post(Window* window, const char* ext) { - if (ext != nil) { - static char filter[100]; - strcpy(filter, "*."); - strcat(filter, ext); - String v; - if (!style_->find_attribute("filterPattern", v) || v != filter) { - style_->attribute("filterPattern", filter); - chooser_->reread(); - } - } - if (chooser_->post_for(window)) { - const String* s = chooser_->selected(); - if (s != nil) { - return s->string(); - } - } - return nil; -} - -declareActionCallback(Asker) -implementActionCallback(Asker) - -#define AskerCallback(f) ActionCallback(Asker)(this, &Asker::f) - -declareFieldEditorCallback(Asker) -implementFieldEditorCallback(Asker) - -Asker::Asker(const char* name, const char* prompt) { - WidgetKit& kit = *WidgetKit::instance(); - const LayoutKit& layout = *LayoutKit::instance(); - Style* s = new Style(kit.style()); - s->attribute("name", name); - editor_ = DialogKit::instance()->field_editor( - "", s, new FieldEditorCallback(Asker)( - this, &Asker::accept_editor, &Asker::cancel_editor - ) - ); - Glyph* sep = layout.vglue(11, fil, 11); - dialog_ = new Dialog( - kit.inset_frame( - layout.margin( - layout.vbox( - layout.hbox(kit.label(prompt), layout.hglue()), - sep, - editor_, - sep, - layout.hbox( - layout.hglue(100, fil, 100), - kit.default_button("OK", new AskerCallback(accept)), - layout.hglue(9, 0, 9), - kit.push_button("Cancel", new AskerCallback(cancel)) - ) - ), - 12, 12 - ) - ), - s - ); - dialog_->append_input_handler(editor_); - dialog_->next_focus(); - Resource::ref(dialog_); -} - -Asker::~Asker() { - Resource::unref(dialog_); -} - -const char* Asker::post(Window* window, const char* initial) { - if (initial != nil) { - editor_->field(initial); - } - if (dialog_->post_for(window)) { - const String* s = editor_->text(); - if (s != nil) { - return s->string(); - } - } - return nil; -} - -void Asker::accept_editor(FieldEditor*) { - dialog_->dismiss(true); -} - -void Asker::cancel_editor(FieldEditor*) { - dialog_->dismiss(false); -} - -void Asker::accept() { dialog_->dismiss(true); } -void Asker::cancel() { dialog_->dismiss(false); } - -declareActionCallback(Confirmer) -implementActionCallback(Confirmer) - -#define ConfirmerCallback(f) ActionCallback(Confirmer)(this, &Confirmer::f) - -Confirmer::Confirmer(const char* name, const char* prompt) { - WidgetKit& kit = *WidgetKit::instance(); - const LayoutKit& layout = *LayoutKit::instance(); - Style* s = new Style(kit.style()); - s->attribute("name", name); - Glyph* sep = layout.hspace(8); - dialog_ = new Dialog( - kit.outset_frame( - layout.margin( - layout.vbox( - layout.hbox(kit.label(prompt), layout.hglue()), - layout.vglue(16, 20, 8), - layout.hbox( - layout.hglue(30, fil, 0), - kit.push_button( - "Cancel", new ConfirmerCallback(cancel) - ), - sep, - kit.push_button( - "No", new ConfirmerCallback(no) - ), - sep, - kit.push_button( - "Yes", new ConfirmerCallback(yes) - ) - ) - ), - 12, 12 - ) - ), - s - ); - Resource::ref(dialog_); -} - -Confirmer::~Confirmer() { - Resource::unref(dialog_); -} - -int Confirmer::post(Window* window) { - if (dialog_->post_for(window)) { - return confirm_ ? 1 : 2; - } - return 3; -} - -void Confirmer::yes() { confirm_ = true; dialog_->dismiss(true); } -void Confirmer::no() { confirm_ = false; dialog_->dismiss(true); } -void Confirmer::cancel() { dialog_->dismiss(false); } - -declareActionCallback(Reporter) -implementActionCallback(Reporter) - -#define ReporterCallback(f) ActionCallback(Reporter)(this, &Reporter::f) - -Reporter::Reporter(const char* name, const char* prompt) { - WidgetKit& kit = *WidgetKit::instance(); - const LayoutKit& layout = *LayoutKit::instance(); - Style* s = new Style(kit.style()); - s->attribute("name", name); - dialog_ = new Dialog( - kit.outset_frame( - layout.margin( - layout.vbox( - layout.hbox(kit.label(prompt), layout.hglue()), - layout.vglue(16, 20, 8), - layout.hbox( - layout.hglue(36, fil, 0), - kit.push_button("OK", new ReporterCallback(ok)) - ) - ), - 12, 12 - ) - ), - s - ); - Resource::ref(dialog_); -} - -Reporter::~Reporter() { - Resource::unref(dialog_); -} - -void Reporter::post(Window* window) { - dialog_->post_for(window); -} - -void Reporter::ok() { dialog_->dismiss(true); } diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/dialogs.h iv-3.1-g++2.7.2/iv/src/bin/doc/dialogs.h --- iv-3.1/iv/src/bin/doc/dialogs.h Fri Jul 31 00:38:28 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/dialogs.h Thu Jan 1 01:00:00 1970 @@ -1,90 +0,0 @@ -/* - * Copyright (c) 1987-1992 Stanford University - * Copyright (c) 1991-1992 Silicon Graphics, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and - * its documentation for any purpose is hereby granted without fee, provided - * that (i) the above copyright notices and this permission notice appear in - * all copies of the software and related documentation, and (ii) the names of - * Stanford and Silicon Graphics may not be used in any advertising or - * publicity relating to the software without the specific, prior written - * permission of Stanford and Silicon Graphics. - * - * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, - * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY - * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - * - * IN NO EVENT SHALL STANFORD OR SILICON GRAPHICS BE LIABLE FOR - * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, - * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF - * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THIS SOFTWARE. - */ - -#ifndef dialogs_h -#define dialogs_h - -#include - -class Dialog; -class FieldEditor; -class FileChooser; -class Style; -class Window; - -class Chooser { -public: - Chooser(const char*, const char* prompt); - virtual ~Chooser(); - - virtual const char* post(Window*, const char* ext); -private: - FileChooser* chooser_; - Style* style_; -}; - -class Asker { -public: - Asker(const char*, const char* prompt); - virtual ~Asker(); - - virtual const char* post(Window*, const char* initial); -private: - Dialog* dialog_; - FieldEditor* editor_; - - void accept_editor(FieldEditor*); - void cancel_editor(FieldEditor*); - void accept(); - void cancel(); -}; - -class Confirmer { -public: - Confirmer(const char*, const char* prompt); - virtual ~Confirmer(); - - virtual int post(Window*); -private: - Dialog* dialog_; - boolean confirm_; - - void yes(); - void no(); - void cancel(); -}; - -class Reporter { -public: - Reporter(const char*, const char* message); - virtual ~Reporter(); - - virtual void post(Window*); -private: - Dialog* dialog_; - - void ok(); -}; - -#endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/doc-composition.c iv-3.1-g++2.7.2/iv/src/bin/doc/doc-composition.c --- iv-3.1/iv/src/bin/doc/doc-composition.c Mon Jul 13 19:19:32 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/doc-composition.c Tue Apr 2 13:52:04 1996 @@ -22,6 +22,9 @@ * OF THIS SOFTWARE. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "doc-composition.h" #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/doc-composition.h iv-3.1-g++2.7.2/iv/src/bin/doc/doc-composition.h --- iv-3.1/iv/src/bin/doc/doc-composition.h Sat Apr 11 07:31:00 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/doc-composition.h Tue Apr 2 13:52:04 1996 @@ -25,6 +25,10 @@ #ifndef composition_h #define composition_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class CompositionComponent_List; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/doc-deck.c iv-3.1-g++2.7.2/iv/src/bin/doc/doc-deck.c --- iv-3.1/iv/src/bin/doc/doc-deck.c Mon Jul 13 19:20:28 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/doc-deck.c Tue Apr 2 13:52:04 1996 @@ -22,6 +22,9 @@ * OF THIS SOFTWARE. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "doc-deck.h" #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/doc-deck.h iv-3.1-g++2.7.2/iv/src/bin/doc/doc-deck.h --- iv-3.1/iv/src/bin/doc/doc-deck.h Thu Jun 18 02:10:21 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/doc-deck.h Tue Apr 2 13:52:04 1996 @@ -25,6 +25,10 @@ #ifndef deck_h #define deck_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/doc-dialogs.c iv-3.1-g++2.7.2/iv/src/bin/doc/doc-dialogs.c --- iv-3.1/iv/src/bin/doc/doc-dialogs.c Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/doc-dialogs.c Tue Apr 2 13:52:04 1996 @@ -0,0 +1,234 @@ +/* + * Copyright (c) 1987-1992 Stanford University + * Copyright (c) 1991-1992 Silicon Graphics, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software and + * its documentation for any purpose is hereby granted without fee, provided + * that (i) the above copyright notices and this permission notice appear in + * all copies of the software and related documentation, and (ii) the names of + * Stanford and Silicon Graphics may not be used in any advertising or + * publicity relating to the software without the specific, prior written + * permission of Stanford and Silicon Graphics. + * + * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, + * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY + * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + * + * IN NO EVENT SHALL STANFORD OR SILICON GRAPHICS BE LIABLE FOR + * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, + * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF + * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ + +#include "doc-dialogs.h" +#include +#include +#include +#include +#include +#include +#include +#include + +Chooser::Chooser(const char* name, const char* prompt) { + Style* s = new Style(Session::instance()->style()); + s->attribute("name", name); + s->attribute("subcaption", prompt); + chooser_ = DialogKit::instance()->file_chooser(".", s, nil); + Resource::ref(chooser_); + style_ = s; + Resource::ref(style_); +} + +Chooser::~Chooser() { + Resource::unref(chooser_); + Resource::unref(style_); +} + +const char* Chooser::post(Window* window, const char* ext) { + if (ext != nil) { + static char filter[100]; + strcpy(filter, "*."); + strcat(filter, ext); + String v; + if (!style_->find_attribute("filterPattern", v) || v != filter) { + style_->attribute("filterPattern", filter); + chooser_->reread(); + } + } + if (chooser_->post_for(window)) { + const String* s = chooser_->selected(); + if (s != nil) { + return s->string(); + } + } + return nil; +} + +declareActionCallback(Asker) +implementActionCallback(Asker) + +#define AskerCallback(f) ActionCallback(Asker)(this, &Asker::f) + +declareFieldEditorCallback(Asker) +implementFieldEditorCallback(Asker) + +Asker::Asker(const char* name, const char* prompt) { + WidgetKit& kit = *WidgetKit::instance(); + const LayoutKit& layout = *LayoutKit::instance(); + Style* s = new Style(kit.style()); + s->attribute("name", name); + editor_ = DialogKit::instance()->field_editor( + "", s, new FieldEditorCallback(Asker)( + this, &Asker::accept_editor, &Asker::cancel_editor + ) + ); + Glyph* sep = layout.vglue(11, fil, 11); + dialog_ = new Dialog( + kit.inset_frame( + layout.margin( + layout.vbox( + layout.hbox(kit.label(prompt), layout.hglue()), + sep, + editor_, + sep, + layout.hbox( + layout.hglue(100, fil, 100), + kit.default_button("OK", new AskerCallback(accept)), + layout.hglue(9, 0, 9), + kit.push_button("Cancel", new AskerCallback(cancel)) + ) + ), + 12, 12 + ) + ), + s + ); + dialog_->append_input_handler(editor_); + dialog_->next_focus(); + Resource::ref(dialog_); +} + +Asker::~Asker() { + Resource::unref(dialog_); +} + +const char* Asker::post(Window* window, const char* initial) { + if (initial != nil) { + editor_->field(initial); + } + if (dialog_->post_for(window)) { + const String* s = editor_->text(); + if (s != nil) { + return s->string(); + } + } + return nil; +} + +void Asker::accept_editor(FieldEditor*) { + dialog_->dismiss(true); +} + +void Asker::cancel_editor(FieldEditor*) { + dialog_->dismiss(false); +} + +void Asker::accept() { dialog_->dismiss(true); } +void Asker::cancel() { dialog_->dismiss(false); } + +declareActionCallback(Confirmer) +implementActionCallback(Confirmer) + +#define ConfirmerCallback(f) ActionCallback(Confirmer)(this, &Confirmer::f) + +Confirmer::Confirmer(const char* name, const char* prompt) { + WidgetKit& kit = *WidgetKit::instance(); + const LayoutKit& layout = *LayoutKit::instance(); + Style* s = new Style(kit.style()); + s->attribute("name", name); + Glyph* sep = layout.hspace(8); + dialog_ = new Dialog( + kit.outset_frame( + layout.margin( + layout.vbox( + layout.hbox(kit.label(prompt), layout.hglue()), + layout.vglue(16, 20, 8), + layout.hbox( + layout.hglue(30, fil, 0), + kit.push_button( + "Cancel", new ConfirmerCallback(cancel) + ), + sep, + kit.push_button( + "No", new ConfirmerCallback(no) + ), + sep, + kit.push_button( + "Yes", new ConfirmerCallback(yes) + ) + ) + ), + 12, 12 + ) + ), + s + ); + Resource::ref(dialog_); +} + +Confirmer::~Confirmer() { + Resource::unref(dialog_); +} + +int Confirmer::post(Window* window) { + if (dialog_->post_for(window)) { + return confirm_ ? 1 : 2; + } + return 3; +} + +void Confirmer::yes() { confirm_ = true; dialog_->dismiss(true); } +void Confirmer::no() { confirm_ = false; dialog_->dismiss(true); } +void Confirmer::cancel() { dialog_->dismiss(false); } + +declareActionCallback(Reporter) +implementActionCallback(Reporter) + +#define ReporterCallback(f) ActionCallback(Reporter)(this, &Reporter::f) + +Reporter::Reporter(const char* name, const char* prompt) { + WidgetKit& kit = *WidgetKit::instance(); + const LayoutKit& layout = *LayoutKit::instance(); + Style* s = new Style(kit.style()); + s->attribute("name", name); + dialog_ = new Dialog( + kit.outset_frame( + layout.margin( + layout.vbox( + layout.hbox(kit.label(prompt), layout.hglue()), + layout.vglue(16, 20, 8), + layout.hbox( + layout.hglue(36, fil, 0), + kit.push_button("OK", new ReporterCallback(ok)) + ) + ), + 12, 12 + ) + ), + s + ); + Resource::ref(dialog_); +} + +Reporter::~Reporter() { + Resource::unref(dialog_); +} + +void Reporter::post(Window* window) { + dialog_->post_for(window); +} + +void Reporter::ok() { dialog_->dismiss(true); } diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/doc-dialogs.h iv-3.1-g++2.7.2/iv/src/bin/doc/doc-dialogs.h --- iv-3.1/iv/src/bin/doc/doc-dialogs.h Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/doc-dialogs.h Tue Apr 2 13:52:04 1996 @@ -0,0 +1,90 @@ +/* + * Copyright (c) 1987-1992 Stanford University + * Copyright (c) 1991-1992 Silicon Graphics, Inc. + * + * Permission to use, copy, modify, distribute, and sell this software and + * its documentation for any purpose is hereby granted without fee, provided + * that (i) the above copyright notices and this permission notice appear in + * all copies of the software and related documentation, and (ii) the names of + * Stanford and Silicon Graphics may not be used in any advertising or + * publicity relating to the software without the specific, prior written + * permission of Stanford and Silicon Graphics. + * + * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, + * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY + * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + * + * IN NO EVENT SHALL STANFORD OR SILICON GRAPHICS BE LIABLE FOR + * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, + * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF + * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ + +#ifndef dialogs_h +#define dialogs_h + +#include + +class Dialog; +class FieldEditor; +class FileChooser; +class Style; +class Window; + +class Chooser { +public: + Chooser(const char*, const char* prompt); + virtual ~Chooser(); + + virtual const char* post(Window*, const char* ext); +private: + FileChooser* chooser_; + Style* style_; +}; + +class Asker { +public: + Asker(const char*, const char* prompt); + virtual ~Asker(); + + virtual const char* post(Window*, const char* initial); +private: + Dialog* dialog_; + FieldEditor* editor_; + + void accept_editor(FieldEditor*); + void cancel_editor(FieldEditor*); + void accept(); + void cancel(); +}; + +class Confirmer { +public: + Confirmer(const char*, const char* prompt); + virtual ~Confirmer(); + + virtual int post(Window*); +private: + Dialog* dialog_; + boolean confirm_; + + void yes(); + void no(); + void cancel(); +}; + +class Reporter { +public: + Reporter(const char*, const char* message); + virtual ~Reporter(); + + virtual void post(Window*); +private: + Dialog* dialog_; + + void ok(); +}; + +#endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/doc-listener.c iv-3.1-g++2.7.2/iv/src/bin/doc/doc-listener.c --- iv-3.1/iv/src/bin/doc/doc-listener.c Fri Jun 19 22:07:21 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/doc-listener.c Tue Apr 2 13:52:04 1996 @@ -22,6 +22,9 @@ * OF THIS SOFTWARE. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "doc-listener.h" #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/doc-listener.h iv-3.1-g++2.7.2/iv/src/bin/doc/doc-listener.h --- iv-3.1/iv/src/bin/doc/doc-listener.h Fri Jun 19 22:07:22 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/doc-listener.h Tue Apr 2 13:52:05 1996 @@ -29,6 +29,10 @@ #ifndef listener_h #define listener_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/doc-patch.c iv-3.1-g++2.7.2/iv/src/bin/doc/doc-patch.c --- iv-3.1/iv/src/bin/doc/doc-patch.c Fri Jun 19 22:05:41 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/doc-patch.c Tue Apr 2 13:52:05 1996 @@ -25,6 +25,10 @@ /* * Patch - for repairing glyphs */ +#ifdef __GNUG__ +#pragma implementation "doc-patch.h" +#pragma implementation "patch.h" +#endif #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/doc-patch.h iv-3.1-g++2.7.2/iv/src/bin/doc/doc-patch.h --- iv-3.1/iv/src/bin/doc/doc-patch.h Sat Apr 11 07:31:08 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/doc-patch.h Tue Apr 2 13:52:05 1996 @@ -29,6 +29,10 @@ #ifndef patch_h #define patch_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class DocPatch : public MonoGlyph { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/doc-target.c iv-3.1-g++2.7.2/iv/src/bin/doc/doc-target.c --- iv-3.1/iv/src/bin/doc/doc-target.c Sat Apr 11 07:31:10 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/doc-target.c Tue Apr 2 13:52:05 1996 @@ -26,6 +26,9 @@ * DocTarget - hit sensitivity control */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "doc-target.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/doc-target.h iv-3.1-g++2.7.2/iv/src/bin/doc/doc-target.h --- iv-3.1/iv/src/bin/doc/doc-target.h Sat Apr 11 07:31:11 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/doc-target.h Tue Apr 2 13:52:05 1996 @@ -29,6 +29,10 @@ #ifndef target_h #define target_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class DocTarget : public MonoGlyph { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/doc/main.c iv-3.1-g++2.7.2/iv/src/bin/doc/main.c --- iv-3.1/iv/src/bin/doc/main.c Sat Apr 11 07:31:13 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/doc/main.c Tue Apr 2 13:52:05 1996 @@ -20,6 +20,8 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +int iv_3_1l_inofficial_iv_fixes_enabled = 1; + #include "Application.h" #include "Document.h" #include "DocViewer.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibadjuster.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibadjuster.c --- iv-3.1/iv/src/bin/ibuild/ibadjuster.c Fri Apr 24 22:14:52 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibadjuster.c Tue Apr 2 13:52:05 1996 @@ -24,6 +24,9 @@ * Adjuster component definitions. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibadjuster.h" #include "ibclasses.h" #include "ibcmds.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibadjuster.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibadjuster.h --- iv-3.1/iv/src/bin/ibuild/ibadjuster.h Fri Apr 24 22:14:52 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibadjuster.h Tue Apr 2 13:52:05 1996 @@ -27,6 +27,10 @@ #ifndef ibadjuster_h #define ibadjuster_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibcode.h" #include "ibinteractor.h" #include "ibgraphic.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibbitmap.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibbitmap.c --- iv-3.1/iv/src/bin/ibuild/ibbitmap.c Fri Apr 24 22:14:52 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibbitmap.c Tue Apr 2 13:52:06 1996 @@ -24,6 +24,9 @@ * Bitmap component definitions. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibbitmap.h" #include "ibclasses.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibbitmap.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibbitmap.h --- iv-3.1/iv/src/bin/ibuild/ibbitmap.h Fri Apr 24 22:14:52 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibbitmap.h Tue Apr 2 13:52:06 1996 @@ -27,6 +27,10 @@ #ifndef ibbitmap_h #define ibbitmap_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibborder.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibborder.c --- iv-3.1/iv/src/bin/ibuild/ibborder.c Tue Apr 28 21:40:35 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibborder.c Tue Apr 2 13:52:06 1996 @@ -24,6 +24,9 @@ * Border component definitions. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibborder.h" #include "ibclasses.h" #include "ibcmds.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibborder.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibborder.h --- iv-3.1/iv/src/bin/ibuild/ibborder.h Fri Apr 24 22:14:52 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibborder.h Tue Apr 2 13:52:06 1996 @@ -27,6 +27,10 @@ #ifndef ibborder_h #define ibborder_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibcode.h" #include "ibgraphic.h" #include "ibinteractor.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibbox.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibbox.c --- iv-3.1/iv/src/bin/ibuild/ibbox.c Fri Apr 24 22:14:52 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibbox.c Tue Apr 2 13:52:06 1996 @@ -24,6 +24,9 @@ * Implementation of Box component and derived classes. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibbox.h" #include "ibclasses.h" #include "ibvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibbox.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibbox.h --- iv-3.1/iv/src/bin/ibuild/ibbox.h Tue Jun 9 19:57:03 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibbox.h Tue Apr 2 13:52:06 1996 @@ -27,6 +27,10 @@ #ifndef ibbox_h #define ibbox_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibscene.h" class PointObj; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibbutton.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibbutton.c --- iv-3.1/iv/src/bin/ibuild/ibbutton.c Fri Nov 13 06:16:01 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibbutton.c Tue Apr 2 13:52:06 1996 @@ -24,6 +24,9 @@ * Button component definitions. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibbutton.h" #include "ibclasses.h" #include "ibcmds.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibbutton.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibbutton.h --- iv-3.1/iv/src/bin/ibuild/ibbutton.h Fri Nov 13 06:16:25 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibbutton.h Tue Apr 2 13:52:06 1996 @@ -27,6 +27,10 @@ #ifndef ibbutton_h #define ibbutton_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibmessage.h" class ButtonState; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibcatalog.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcatalog.c --- iv-3.1/iv/src/bin/ibuild/ibcatalog.c Wed Sep 9 00:36:27 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcatalog.c Tue Apr 2 13:52:07 1996 @@ -24,6 +24,10 @@ * IBuildCatalog implementation. */ +#ifdef __GNUG__ +#pragma implementation "psformat.h" +#pragma implementation "ibcatalog.h" +#endif #include "ibcatalog.h" #include "ibcmds.h" #include "ibellipse.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibcatalog.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcatalog.h --- iv-3.1/iv/src/bin/ibuild/ibcatalog.h Tue Jun 9 19:58:33 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcatalog.h Tue Apr 2 13:52:07 1996 @@ -28,6 +28,10 @@ #ifndef ibcatalog_h #define ibcatalog_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class GraphicComp; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibcmds.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcmds.c --- iv-3.1/iv/src/bin/ibuild/ibcmds.c Sat Dec 12 05:33:25 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcmds.c Tue Apr 2 18:38:11 1996 @@ -27,6 +27,9 @@ #include "ibbitmap.h" #include "ibbutton.h" #include "ibclasses.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibcmds.h" #include "ibcode.h" #include "ibcomp.h" @@ -86,7 +89,9 @@ #undef FileChooser #define FileChooser _lib_iv(FileChooser) +#ifndef __alpha #include +#endif #include #include #include @@ -106,15 +111,15 @@ /*****************************************************************************/ // 4.2 -> hpux standard conversion of getwd -#if defined(hpux) || defined(sco) || (defined(sun) && OSMajorVersion >= 5) +#if defined(hpux) || defined(sco) || (defined(sun) && OSMajorVersion >= 5) || defined(_FTX) #include #define getwd(a) getcwd(a,MAXPATHLEN) #endif -#ifdef __DECCXX +#ifdef __alpha extern "C" { - int getwd(char*); - int vfork(); + char* getwd(char*); + pid_t vfork(); int execlp(char*, ...); int unlink(char*); pid_t fork(); @@ -173,9 +178,9 @@ ed->RemoveDialog(&dialog); } -static boolean Abort (Editor* ed, int pid, const char* warning) { +static boolean Abort (Editor* ed, pid_t pid, const char* warning) { boolean aborted; - AbortDialog dialog(pid, warning); + AbortDialog dialog((int)pid, warning); ed->InsertDialog(&dialog); aborted = dialog.Abort(); ed->RemoveDialog(&dialog); @@ -1364,7 +1369,7 @@ char* tmpname = tmpnam(NULL); _grblock->WriteGraphicComp(tmpname); - int pid = vfork(); + pid_t pid = vfork(); if (pid == -1) { sprintf(buf, "Can't fork to execute idraw"); Warning(ed, buf); @@ -1849,7 +1854,7 @@ ok = (system(cmd) == 0) && ok; char buf[CHARBUFSIZE]; - int pid = fork(); + pid_t pid = fork(); if (pid == -1) { sprintf(buf, "Cannot fork to make %s", orig); Warning(GetEditor(), buf); @@ -2079,7 +2084,7 @@ char* orig = GetOrigName(file); char* dir = GetDirName(file); char buf[CHARBUFSIZE]; - int pid = fork(); + pid_t pid = fork(); if (pid == -1) { sprintf(buf, "Cannot fork to make %s", orig); Warning(GetEditor(), buf); @@ -2131,7 +2136,7 @@ if (accepted) { char buf[CHARBUFSIZE]; char* name = (char* )_dialog->Choice(); - int pid = vfork(); + pid_t pid = vfork(); if (pid == -1) { sprintf(buf, "Can't fork to execute \"%s\"\n", name); Warning(ed, buf); @@ -2276,7 +2281,7 @@ } } if (ok) { - int pid = fork(); + pid_t pid = fork(); if (pid == -1) { Warning(ed, "Can't fork to run bitmap!"); } else if (pid == 0) { @@ -2415,7 +2420,7 @@ for (int i = 0; i < installed->Count(); i++) { itoolpanel->Install(installed->GetName(i)); } - for (i = 0; i < removed->Count(); i++) { + for (int i = 0; i < removed->Count(); i++) { itoolpanel->Uninstall(removed->GetName(i)); } itoolpanel->Change(); diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibcmds.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcmds.h --- iv-3.1/iv/src/bin/ibuild/ibcmds.h Mon Oct 19 21:33:11 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcmds.h Tue Apr 2 13:52:07 1996 @@ -27,6 +27,10 @@ #ifndef ibcmds_h #define ibcmds_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibcode.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcode.c --- iv-3.1/iv/src/bin/ibuild/ibcode.c Mon Oct 19 18:58:01 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcode.c Tue Apr 2 13:52:07 1996 @@ -26,6 +26,9 @@ #include "ibclasses.h" #include "ibcmds.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibcode.h" #include "ibinteractor.h" #include "ibcomp.h" @@ -41,6 +44,7 @@ #include #include #include +#include #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibcode.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcode.h --- iv-3.1/iv/src/bin/ibuild/ibcode.h Mon Jul 13 19:50:05 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcode.h Tue Apr 2 13:52:07 1996 @@ -28,6 +28,10 @@ #ifndef ibcode_h #define ibcode_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibcommandctrl.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcommandctrl.c --- iv-3.1/iv/src/bin/ibuild/ibcommandctrl.c Tue Nov 10 19:20:19 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcommandctrl.c Tue Apr 2 13:52:07 1996 @@ -33,6 +33,9 @@ #include "ibgrcomp.h" #include "ibvars.h" #include "ibvarviews.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibcommandctrl.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibcommandctrl.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcommandctrl.h --- iv-3.1/iv/src/bin/ibuild/ibcommandctrl.h Fri Apr 24 22:14:53 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcommandctrl.h Tue Apr 2 13:52:08 1996 @@ -23,6 +23,10 @@ #ifndef ibcommandctrl_h #define ibcommandctrl_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibpanelctrl.h" class CommandCtrlComp : public PanelCtrlComp { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibcomp.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcomp.c --- iv-3.1/iv/src/bin/ibuild/ibcomp.c Wed Sep 9 00:34:46 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcomp.c Tue Apr 2 13:52:08 1996 @@ -28,6 +28,9 @@ #include "ibcmds.h" #include "ibcreator.h" #include "ibdialogs.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibcomp.h" #include "ibgrblock.h" #include "ibmanips.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibcomp.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcomp.h --- iv-3.1/iv/src/bin/ibuild/ibcomp.h Fri Apr 24 22:14:53 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcomp.h Tue Apr 2 13:52:08 1996 @@ -27,6 +27,10 @@ #ifndef ibcomp_h #define ibcomp_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibcreator.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcreator.c --- iv-3.1/iv/src/bin/ibuild/ibcreator.c Fri Apr 24 22:14:53 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcreator.c Tue Apr 2 13:52:08 1996 @@ -39,6 +39,9 @@ #include "ibcmds.h" #include "ibcommandctrl.h" #include "ibcode.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibcreator.h" #include "ibdialog.h" #include "ibeditor.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibcreator.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcreator.h --- iv-3.1/iv/src/bin/ibuild/ibcreator.h Fri Apr 24 22:14:53 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibcreator.h Tue Apr 2 13:52:08 1996 @@ -27,6 +27,10 @@ #ifndef ibcreator_h #define ibcreator_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class IBCreator : public Creator { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibctrl.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibctrl.c --- iv-3.1/iv/src/bin/ibuild/ibctrl.c Fri Apr 24 22:14:53 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibctrl.c Tue Apr 2 13:52:08 1996 @@ -24,6 +24,9 @@ * ToolPanelControl implementation. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibctrl.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibctrl.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibctrl.h --- iv-3.1/iv/src/bin/ibuild/ibctrl.h Fri Apr 24 22:14:54 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibctrl.h Tue Apr 2 13:52:08 1996 @@ -27,6 +27,10 @@ #ifndef ibctrl_h #define ibctrl_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class ToolPanelControl : public PanelControl { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibdeck.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibdeck.c --- iv-3.1/iv/src/bin/ibuild/ibdeck.c Fri Apr 24 22:14:54 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibdeck.c Tue Apr 2 13:52:08 1996 @@ -26,6 +26,9 @@ #include "ibclasses.h" #include "ibcmds.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibdeck.h" #include "ibvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibdeck.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibdeck.h --- iv-3.1/iv/src/bin/ibuild/ibdeck.h Fri Apr 24 22:14:54 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibdeck.h Tue Apr 2 13:52:10 1996 @@ -27,6 +27,10 @@ #ifndef ibdeck_h #define ibdeck_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibscene.h" #include "ibgraphic.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibdialog.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibdialog.c --- iv-3.1/iv/src/bin/ibuild/ibdialog.c Wed Oct 28 02:19:27 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibdialog.c Tue Apr 2 13:52:10 1996 @@ -26,6 +26,9 @@ #include "ibclasses.h" #include "ibcmds.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibdialog.h" #include "ibdialogs.h" #include "ibvars.h" @@ -37,6 +40,9 @@ #include #include #include +#ifdef __alpha +#include +#endif /*****************************************************************************/ @@ -270,7 +276,9 @@ ) { ok = ok && CheckToEmitHeader(out, bsname); - } else if (!_namelist->Search("button")) { + } else if ( + strcmp(subclass, _classname) == 0 && !_namelist->Search("button") + ) { _namelist->Append("button"); out << "#include \n"; } diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibdialog.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibdialog.h --- iv-3.1/iv/src/bin/ibuild/ibdialog.h Fri Apr 24 22:14:54 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibdialog.h Tue Apr 2 13:52:10 1996 @@ -27,6 +27,10 @@ #ifndef ibdialog_h #define ibdialog_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibscene.h" class ButtonStateVar; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibdialogs.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibdialogs.c --- iv-3.1/iv/src/bin/ibuild/ibdialogs.c Wed Sep 23 18:43:09 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibdialogs.c Tue Apr 2 13:52:10 1996 @@ -26,6 +26,9 @@ #include "ibclasses.h" #include "ibcmds.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibdialogs.h" #include "ibed.h" #include "ibglobals.h" @@ -60,7 +63,9 @@ #include #include +#ifndef __alpha #include +#endif #include #include #include @@ -80,9 +85,9 @@ #endif #endif -#ifdef __DECCXX +#ifdef __alpha extern "C" { - int killpg(int, int); + int killpg(pid_t, int); } #endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibdialogs.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibdialogs.h --- iv-3.1/iv/src/bin/ibuild/ibdialogs.h Fri Apr 24 22:14:54 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibdialogs.h Tue Apr 2 13:52:10 1996 @@ -27,6 +27,10 @@ #ifndef ibdialogs_h #define ibdialogs_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibed.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibed.c --- iv-3.1/iv/src/bin/ibuild/ibed.c Tue Nov 10 19:16:15 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibed.c Tue Apr 2 13:52:11 1996 @@ -31,6 +31,9 @@ #include "ibcmds.h" #include "ibdeck.h" #include "ibdialog.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibed.h" #include "ibeditor.h" #include "ibellipse.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibed.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibed.h --- iv-3.1/iv/src/bin/ibuild/ibed.h Tue Jun 9 19:56:12 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibed.h Tue Apr 2 13:52:11 1996 @@ -27,6 +27,10 @@ #ifndef ibed_h #define ibed_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Box; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibeditor.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibeditor.c --- iv-3.1/iv/src/bin/ibuild/ibeditor.c Tue Nov 10 19:16:24 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibeditor.c Tue Apr 2 13:52:11 1996 @@ -31,6 +31,9 @@ #include "ibed.h" #include "ibgraphic.h" #include "ibgrcomp.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibeditor.h" #include "ibpanelctrl.h" #include "ibvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibeditor.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibeditor.h --- iv-3.1/iv/src/bin/ibuild/ibeditor.h Fri Apr 24 22:14:54 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibeditor.h Tue Apr 2 13:52:11 1996 @@ -27,6 +27,10 @@ #ifndef ibeditor_h #define ibeditor_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibcode.h" #include "ibscene.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibellipse.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibellipse.c --- iv-3.1/iv/src/bin/ibuild/ibellipse.c Fri Apr 24 22:14:55 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibellipse.c Tue Apr 2 13:52:11 1996 @@ -25,6 +25,9 @@ */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibellipse.h" #include "ibclasses.h" #include "ibvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibellipse.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibellipse.h --- iv-3.1/iv/src/bin/ibuild/ibellipse.h Fri Apr 24 22:14:55 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibellipse.h Tue Apr 2 13:52:11 1996 @@ -27,6 +27,10 @@ #ifndef ibellipse_h #define ibellipse_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibcode.h" #include "ibcomp.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibfbrowser.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibfbrowser.c --- iv-3.1/iv/src/bin/ibuild/ibfbrowser.c Mon Oct 19 19:49:56 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibfbrowser.c Tue Apr 2 13:52:11 1996 @@ -29,6 +29,9 @@ #include "ibdialogs.h" #include "ibed.h" #include "ibgraphic.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibfbrowser.h" #include "ibvars.h" #include "ibvarviews.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibfbrowser.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibfbrowser.h --- iv-3.1/iv/src/bin/ibuild/ibfbrowser.h Fri Apr 24 22:14:55 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibfbrowser.h Tue Apr 2 13:52:11 1996 @@ -27,6 +27,10 @@ #ifndef ibfbrowser_h #define ibfbrowser_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibstrbrowser.h" class FBrowserVar; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibframe.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibframe.c --- iv-3.1/iv/src/bin/ibuild/ibframe.c Fri Aug 28 17:52:29 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibframe.c Tue Apr 2 13:52:12 1996 @@ -27,6 +27,9 @@ #include "ibclasses.h" #include "ibcmds.h" #include "ibdialogs.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibframe.h" #include "ibrubrect.h" #include "ibvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibframe.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibframe.h --- iv-3.1/iv/src/bin/ibuild/ibframe.h Fri Apr 24 22:14:55 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibframe.h Tue Apr 2 13:52:12 1996 @@ -27,6 +27,10 @@ #ifndef ibframe_h #define ibframe_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibscene.h" #include "ibgraphic.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibglue.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibglue.c --- iv-3.1/iv/src/bin/ibuild/ibglue.c Fri Apr 24 22:14:55 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibglue.c Tue Apr 2 13:52:12 1996 @@ -27,6 +27,9 @@ #include "ibclasses.h" #include "ibcmds.h" #include "ibed.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibglue.h" #include "ibmanips.h" #include "ibvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibglue.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibglue.h --- iv-3.1/iv/src/bin/ibuild/ibglue.h Fri Apr 24 22:14:55 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibglue.h Tue Apr 2 13:52:12 1996 @@ -27,6 +27,10 @@ #ifndef ibglue_h #define ibglue_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibcode.h" #include "ibgraphic.h" #include "ibinteractor.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibgraphic.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibgraphic.c --- iv-3.1/iv/src/bin/ibuild/ibgraphic.c Fri Apr 24 22:14:56 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibgraphic.c Tue Apr 2 13:52:12 1996 @@ -24,6 +24,9 @@ * User interface builder-specific structured graphics implementations. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibgraphic.h" #include "ibvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibgraphic.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibgraphic.h --- iv-3.1/iv/src/bin/ibuild/ibgraphic.h Fri Apr 24 22:14:56 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibgraphic.h Tue Apr 2 13:52:12 1996 @@ -27,6 +27,10 @@ #ifndef ibgraphic_h #define ibgraphic_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibgrblock.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibgrblock.c --- iv-3.1/iv/src/bin/ibuild/ibgrblock.c Fri Aug 28 17:51:52 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibgrblock.c Tue Apr 2 13:52:12 1996 @@ -30,6 +30,9 @@ #include "ibdialogs.h" #include "ibed.h" #include "ibgraphic.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibgrblock.h" #include "ibgrcomp.h" #include "ibinteractor.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibgrblock.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibgrblock.h --- iv-3.1/iv/src/bin/ibuild/ibgrblock.h Fri Apr 24 22:14:56 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibgrblock.h Tue Apr 2 13:52:12 1996 @@ -27,6 +27,10 @@ #ifndef ibgrblock_h #define ibgrblock_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibscene.h" #include "ibgraphic.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibgrcomp.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibgrcomp.c --- iv-3.1/iv/src/bin/ibuild/ibgrcomp.c Fri Apr 24 22:14:56 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibgrcomp.c Tue Apr 2 13:52:13 1996 @@ -24,6 +24,9 @@ * Implementation of IGraphicComps and IGraphicViews and derived classes. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibgrcomp.h" #include "ibclasses.h" #include "ibcmds.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibgrcomp.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibgrcomp.h --- iv-3.1/iv/src/bin/ibuild/ibgrcomp.h Fri Apr 24 22:14:56 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibgrcomp.h Tue Apr 2 13:52:13 1996 @@ -28,6 +28,10 @@ #ifndef ibgrcomp_h #define ibgrcomp_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include "ibcode.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibinteractor.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibinteractor.c --- iv-3.1/iv/src/bin/ibuild/ibinteractor.c Wed Sep 9 00:34:32 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibinteractor.c Tue Apr 2 13:52:13 1996 @@ -24,6 +24,10 @@ * Interactor component definitions. */ +#ifdef __GNUG__ +#pragma implementation +#endif + #include "ibclasses.h" #include "ibcmds.h" #include "ibdialogs.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibinteractor.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibinteractor.h --- iv-3.1/iv/src/bin/ibuild/ibinteractor.h Fri Apr 24 22:14:56 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibinteractor.h Tue Apr 2 13:52:13 1996 @@ -27,6 +27,10 @@ #ifndef ibinteractor_h #define ibinteractor_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibkybd.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibkybd.c --- iv-3.1/iv/src/bin/ibuild/ibkybd.c Fri Apr 24 22:14:56 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibkybd.c Tue Apr 2 13:52:13 1996 @@ -24,6 +24,9 @@ * User interface builder keycode values. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibkybd.h" const char* KLBL_PMOVE = "^M", *CODE_PMOVE = "\015"; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibkybd.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibkybd.h --- iv-3.1/iv/src/bin/ibuild/ibkybd.h Fri Apr 24 22:14:56 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibkybd.h Tue Apr 2 13:52:13 1996 @@ -27,6 +27,10 @@ #ifndef ibkybd_h #define ibkybd_h +#ifdef __GNUG__ +#pragma interface +#endif + extern const char* KLBL_PMOVE, *CODE_PMOVE; extern const char* KLBL_PSCALE, *CODE_PSCALE; extern const char* KLBL_PROTATE, *CODE_PROTATE; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibline.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibline.c --- iv-3.1/iv/src/bin/ibuild/ibline.c Mon Jul 13 19:46:59 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibline.c Tue Apr 2 13:52:13 1996 @@ -24,6 +24,9 @@ * Implementation of ILineComp and IMultiLineComp */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibline.h" #include "ibclasses.h" #include "ibvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibline.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibline.h --- iv-3.1/iv/src/bin/ibuild/ibline.h Fri Apr 24 22:14:56 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibline.h Tue Apr 2 13:52:13 1996 @@ -27,6 +27,10 @@ #ifndef ibline_h #define ibline_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include "ibcode.h" #include "ibcomp.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibmanips.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibmanips.c --- iv-3.1/iv/src/bin/ibuild/ibmanips.c Tue Nov 24 21:01:31 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibmanips.c Tue Apr 2 13:52:14 1996 @@ -25,6 +25,9 @@ */ #include "ibcmds.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibmanips.h" #include "ibtools.h" #include "ibglobals.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibmanips.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibmanips.h --- iv-3.1/iv/src/bin/ibuild/ibmanips.h Fri Apr 24 22:14:57 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibmanips.h Tue Apr 2 13:52:14 1996 @@ -27,6 +27,10 @@ #ifndef ibmanips_h #define ibmanips_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibmenu.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibmenu.c --- iv-3.1/iv/src/bin/ibuild/ibmenu.c Wed Sep 9 00:34:15 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibmenu.c Tue Apr 2 13:52:14 1996 @@ -32,6 +32,9 @@ #include "ibed.h" #include "ibglobals.h" #include "ibinteractor.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibmenu.h" #include "ibtools.h" #include "ibvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibmenu.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibmenu.h --- iv-3.1/iv/src/bin/ibuild/ibmenu.h Fri Apr 24 22:14:57 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibmenu.h Tue Apr 2 13:52:14 1996 @@ -27,6 +27,10 @@ #ifndef ibmenu_h #define ibmenu_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibmessage.h" #include "ibbox.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibmessage.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibmessage.c --- iv-3.1/iv/src/bin/ibuild/ibmessage.c Mon Dec 7 21:14:47 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibmessage.c Tue Apr 2 13:52:14 1996 @@ -24,6 +24,9 @@ * Message component definitions. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibmessage.h" #include "ibclasses.h" #include "ibcmds.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibmessage.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibmessage.h --- iv-3.1/iv/src/bin/ibuild/ibmessage.h Fri Apr 24 22:14:57 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibmessage.h Tue Apr 2 13:52:14 1996 @@ -27,6 +27,10 @@ #ifndef ibmessage_h #define ibmessage_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibcode.h" #include "ibgraphic.h" #include "ibinteractor.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibpanelctrl.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibpanelctrl.c --- iv-3.1/iv/src/bin/ibuild/ibpanelctrl.c Tue Nov 10 19:16:39 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibpanelctrl.c Tue Apr 2 13:52:14 1996 @@ -36,6 +36,9 @@ #include "ibtools.h" #include "ibvars.h" #include "ibvarviews.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibpanelctrl.h" #include "ibcommandctrl.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibpanelctrl.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibpanelctrl.h --- iv-3.1/iv/src/bin/ibuild/ibpanelctrl.h Fri Apr 24 22:14:57 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibpanelctrl.h Tue Apr 2 13:52:14 1996 @@ -27,6 +27,10 @@ #ifndef ibpanelctrl_h #define ibpanelctrl_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibmessage.h" #include "ibviewer.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibpanner.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibpanner.c --- iv-3.1/iv/src/bin/ibuild/ibpanner.c Fri Apr 24 22:14:57 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibpanner.c Tue Apr 2 13:52:15 1996 @@ -33,6 +33,9 @@ #include "ibed.h" #include "ibglue.h" #include "ibgraphic.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibpanner.h" #include "ibrubrect.h" #include "ibslider.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibpanner.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibpanner.h --- iv-3.1/iv/src/bin/ibuild/ibpanner.h Thu Jun 18 01:35:33 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibpanner.h Tue Apr 2 13:52:15 1996 @@ -27,6 +27,10 @@ #ifndef ibpanner_h #define ibpanner_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibbox.h" #include "ibgraphic.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibpolygon.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibpolygon.c --- iv-3.1/iv/src/bin/ibuild/ibpolygon.c Mon Jul 13 19:47:47 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibpolygon.c Tue Apr 2 13:52:15 1996 @@ -25,6 +25,9 @@ */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibpolygon.h" #include "ibclasses.h" #include "ibvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibpolygon.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibpolygon.h --- iv-3.1/iv/src/bin/ibuild/ibpolygon.h Fri Apr 24 22:14:57 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibpolygon.h Tue Apr 2 13:52:15 1996 @@ -27,6 +27,10 @@ #ifndef ibpolygon_h #define ibpolygon_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibcode.h" #include "ibcomp.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibprocs.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibprocs.c --- iv-3.1/iv/src/bin/ibuild/ibprocs.c Fri Sep 11 18:21:59 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibprocs.c Tue Apr 2 13:52:15 1996 @@ -24,6 +24,9 @@ * Hack to workaround portability problems with setpgrp. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibprocs.h" #if defined(SYSV) && !defined(_BSD_COMPAT) diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibprocs.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibprocs.h --- iv-3.1/iv/src/bin/ibuild/ibprocs.h Fri Apr 24 22:14:58 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibprocs.h Tue Apr 2 13:52:15 1996 @@ -27,6 +27,10 @@ #ifndef ibprocs_h #define ibprocs_h +#ifdef __GNUG__ +#pragma interface +#endif + extern void set_child_process_group(); #endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibprops.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibprops.c --- iv-3.1/iv/src/bin/ibuild/ibprops.c Fri Apr 24 22:14:58 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibprops.c Tue Apr 2 13:52:15 1996 @@ -24,6 +24,9 @@ * Implementation of Props and PropsEditor. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibprops.h" #include "ibinteractor.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibprops.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibprops.h --- iv-3.1/iv/src/bin/ibuild/ibprops.h Fri Apr 24 22:14:58 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibprops.h Tue Apr 2 13:52:15 1996 @@ -27,6 +27,10 @@ #ifndef ibprops_h #define ibprops_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibvars.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibraster.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibraster.c --- iv-3.1/iv/src/bin/ibuild/ibraster.c Wed Sep 9 00:36:17 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibraster.c Tue Apr 2 13:52:16 1996 @@ -24,6 +24,9 @@ * IRaster component definitions. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibraster.h" #include "ibclasses.h" #include "ibglobals.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibraster.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibraster.h --- iv-3.1/iv/src/bin/ibuild/ibraster.h Fri Apr 24 22:14:58 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibraster.h Tue Apr 2 13:52:16 1996 @@ -27,6 +27,10 @@ #ifndef ibraster_h #define ibraster_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include "ibcode.h" #include "ibcomp.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibrect.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibrect.c --- iv-3.1/iv/src/bin/ibuild/ibrect.c Fri Apr 24 22:14:58 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibrect.c Tue Apr 2 13:52:16 1996 @@ -25,6 +25,9 @@ */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibrect.h" #include "ibclasses.h" #include "ibvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibrect.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibrect.h --- iv-3.1/iv/src/bin/ibuild/ibrect.h Fri Apr 24 22:14:58 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibrect.h Tue Apr 2 13:52:16 1996 @@ -27,6 +27,10 @@ #ifndef ibrect_h #define ibrect_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibcode.h" #include "ibcomp.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibrubrect.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibrubrect.c --- iv-3.1/iv/src/bin/ibuild/ibrubrect.c Fri Apr 24 22:14:58 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibrubrect.c Tue Apr 2 13:52:16 1996 @@ -24,6 +24,9 @@ * Rubberbanding rectangles. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibrubrect.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibrubrect.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibrubrect.h --- iv-3.1/iv/src/bin/ibuild/ibrubrect.h Fri Apr 24 22:14:58 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibrubrect.h Tue Apr 2 13:52:16 1996 @@ -27,6 +27,10 @@ #ifndef ibrubrect_h #define ibrubrect_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class ConstrainRect : public RubberRect { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibscene.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibscene.c --- iv-3.1/iv/src/bin/ibuild/ibscene.c Fri Apr 24 22:14:58 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibscene.c Tue Apr 2 13:52:16 1996 @@ -29,6 +29,9 @@ #include "ibdialogs.h" #include "ibglobals.h" #include "ibgraphic.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibscene.h" #include "ibtools.h" #include "ibvars.h" @@ -593,7 +596,7 @@ if (kidData != nil) { InteractorComp* oldKid = kidData->GetKid(); Append(oldKid); - kidData->SetKid(newKid); + kidData->SetKid(nil); } else { kidData = new KidData(newKid); cmd->Store(newKid, kidData); diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibscene.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibscene.h --- iv-3.1/iv/src/bin/ibuild/ibscene.h Fri Apr 24 22:14:58 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibscene.h Tue Apr 2 13:52:16 1996 @@ -27,6 +27,10 @@ #ifndef ibscene_h #define ibscene_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibcode.h" #include "ibinteractor.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibscroller.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibscroller.c --- iv-3.1/iv/src/bin/ibuild/ibscroller.c Wed Apr 29 02:02:06 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibscroller.c Tue Apr 2 13:52:17 1996 @@ -27,6 +27,9 @@ #include "ibclasses.h" #include "ibcmds.h" #include "ibdialogs.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibscroller.h" #include "ibvars.h" #include "ibvarviews.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibscroller.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibscroller.h --- iv-3.1/iv/src/bin/ibuild/ibscroller.h Fri Apr 24 22:14:58 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibscroller.h Tue Apr 2 13:52:17 1996 @@ -27,6 +27,10 @@ #ifndef ibscroller_h #define ibscroller_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibcode.h" #include "ibgraphic.h" #include "ibinteractor.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibshaper.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibshaper.c --- iv-3.1/iv/src/bin/ibuild/ibshaper.c Fri Apr 24 22:14:58 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibshaper.c Tue Apr 2 13:52:17 1996 @@ -25,6 +25,9 @@ */ #include "ibclasses.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibshaper.h" #include "ibvars.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibshaper.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibshaper.h --- iv-3.1/iv/src/bin/ibuild/ibshaper.h Fri Apr 24 22:14:59 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibshaper.h Tue Apr 2 13:52:17 1996 @@ -27,6 +27,10 @@ #ifndef ibshaper_h #define ibshaper_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibscene.h" class ShaperComp : public MonoSceneComp { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibslider.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibslider.c --- iv-3.1/iv/src/bin/ibuild/ibslider.c Mon Jun 8 21:44:50 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibslider.c Tue Apr 2 13:52:17 1996 @@ -31,6 +31,9 @@ #include "ibed.h" #include "ibgraphic.h" #include "ibrubrect.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibslider.h" #include "ibvars.h" #include "ibvarviews.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibslider.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibslider.h --- iv-3.1/iv/src/bin/ibuild/ibslider.h Fri Apr 24 22:14:59 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibslider.h Tue Apr 2 13:52:17 1996 @@ -27,6 +27,10 @@ #ifndef ibslider_h #define ibslider_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibcode.h" #include "ibgraphic.h" #include "ibinteractor.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibspline.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibspline.c --- iv-3.1/iv/src/bin/ibuild/ibspline.c Mon Jul 13 19:48:04 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibspline.c Tue Apr 2 13:52:17 1996 @@ -24,6 +24,9 @@ * Implementation of ISplineComp */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibspline.h" #include "ibclasses.h" #include "ibvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibspline.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibspline.h --- iv-3.1/iv/src/bin/ibuild/ibspline.h Fri Apr 24 22:14:59 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibspline.h Tue Apr 2 13:52:17 1996 @@ -27,6 +27,10 @@ #ifndef ibspline_h #define ibspline_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibcode.h" #include "ibcomp.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibstencil.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibstencil.c --- iv-3.1/iv/src/bin/ibuild/ibstencil.c Wed Sep 9 00:36:46 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibstencil.c Tue Apr 2 13:52:18 1996 @@ -24,6 +24,9 @@ * IStencil component definitions. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibstencil.h" #include "ibclasses.h" #include "ibvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibstencil.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibstencil.h --- iv-3.1/iv/src/bin/ibuild/ibstencil.h Fri Apr 24 22:14:59 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibstencil.h Tue Apr 2 13:52:18 1996 @@ -27,6 +27,10 @@ #ifndef ibstencil_h #define ibstencil_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include "ibcode.h" #include "ibcomp.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibstrbrowser.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibstrbrowser.c --- iv-3.1/iv/src/bin/ibuild/ibstrbrowser.c Mon Oct 19 19:50:40 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibstrbrowser.c Tue Apr 2 13:52:18 1996 @@ -30,6 +30,9 @@ #include "ibdialogs.h" #include "ibmessage.h" #include "ibrubrect.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibstrbrowser.h" #include "ibtools.h" #include "ibvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibstrbrowser.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibstrbrowser.h --- iv-3.1/iv/src/bin/ibuild/ibstrbrowser.h Fri Apr 24 22:14:59 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibstrbrowser.h Tue Apr 2 13:52:18 1996 @@ -27,6 +27,10 @@ #ifndef ibstrbrowser_h #define ibstrbrowser_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibbutton.h" class BooleanStateVar; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibstred.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibstred.c --- iv-3.1/iv/src/bin/ibuild/ibstred.c Fri Apr 24 22:14:59 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibstred.c Tue Apr 2 13:52:18 1996 @@ -25,6 +25,9 @@ */ #include "ibclasses.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibstred.h" #include "ibvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibstred.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibstred.h --- iv-3.1/iv/src/bin/ibuild/ibstred.h Fri Apr 24 22:14:59 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibstred.h Tue Apr 2 13:52:18 1996 @@ -27,6 +27,10 @@ #ifndef ibstred_h #define ibstred_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibbutton.h" class StrEditGraphic; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibtext.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibtext.c --- iv-3.1/iv/src/bin/ibuild/ibtext.c Fri Apr 24 22:15:00 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibtext.c Tue Apr 2 13:52:18 1996 @@ -24,6 +24,9 @@ * IText component definitions. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibtext.h" #include "ibclasses.h" #include "ibcmds.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibtext.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibtext.h --- iv-3.1/iv/src/bin/ibuild/ibtext.h Fri Apr 24 22:15:00 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibtext.h Tue Apr 2 13:52:18 1996 @@ -27,6 +27,10 @@ #ifndef ibtext_h #define ibtext_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include "ibcode.h" #include "ibcomp.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibtextedit.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibtextedit.c --- iv-3.1/iv/src/bin/ibuild/ibtextedit.c Fri Apr 24 22:15:00 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibtextedit.c Tue Apr 2 13:52:19 1996 @@ -27,6 +27,9 @@ #include "ibclasses.h" #include "ibdialogs.h" #include "ibmessage.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibtextedit.h" #include "ibvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibtextedit.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibtextedit.h --- iv-3.1/iv/src/bin/ibuild/ibtextedit.h Fri Apr 24 22:15:00 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibtextedit.h Tue Apr 2 13:52:19 1996 @@ -27,6 +27,10 @@ #ifndef ibtextedit_h #define ibtextedit_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibstrbrowser.h" class TextEditComp : public StrBrowserComp { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibtoolpanel.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibtoolpanel.c --- iv-3.1/iv/src/bin/ibuild/ibtoolpanel.c Fri Apr 24 22:15:00 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibtoolpanel.c Tue Apr 2 13:52:19 1996 @@ -48,6 +48,9 @@ #include "ibstred.h" #include "ibstrbrowser.h" #include "ibtextedit.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibtoolpanel.h" #include "ibviewer.h" #include "ibvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibtoolpanel.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibtoolpanel.h --- iv-3.1/iv/src/bin/ibuild/ibtoolpanel.h Fri Apr 24 22:15:00 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibtoolpanel.h Tue Apr 2 13:52:19 1996 @@ -30,6 +30,10 @@ #ifndef ibtoolpanel_h #define ibtoolpanel_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class ControlState; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibtools.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibtools.c --- iv-3.1/iv/src/bin/ibuild/ibtools.c Fri Apr 24 22:15:00 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibtools.c Tue Apr 2 13:52:19 1996 @@ -33,6 +33,9 @@ #include "ibgrcomp.h" #include "ibmanips.h" #include "ibscroller.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibtools.h" #include "ibvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibtools.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibtools.h --- iv-3.1/iv/src/bin/ibuild/ibtools.h Fri Apr 24 22:15:00 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibtools.h Tue Apr 2 13:52:19 1996 @@ -27,6 +27,10 @@ #ifndef ibtools_h #define ibtools_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibvars.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibvars.c --- iv-3.1/iv/src/bin/ibuild/ibvars.c Wed Sep 9 00:33:42 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibvars.c Tue Apr 2 13:52:19 1996 @@ -28,6 +28,9 @@ #include "ibcreator.h" #include "ibglobals.h" #include "ibinteractor.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibvars.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibvars.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibvars.h --- iv-3.1/iv/src/bin/ibuild/ibvars.h Thu Jul 16 00:36:21 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibvars.h Tue Apr 2 13:52:20 1996 @@ -27,6 +27,10 @@ #ifndef ibvars_h #define ibvars_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibvarviews.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibvarviews.c --- iv-3.1/iv/src/bin/ibuild/ibvarviews.c Fri Apr 24 22:15:01 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibvarviews.c Tue Apr 2 13:52:20 1996 @@ -34,6 +34,9 @@ #include "ibmenu.h" #include "ibgrblock.h" #include "ibvars.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibvarviews.h" #include @@ -1567,10 +1570,7 @@ Insert(Interior(bs)); } -FBrowserVarView::~FBrowserVarView () { - delete _dir; - delete _textfilter; -} +FBrowserVarView::~FBrowserVarView () { } boolean FBrowserVarView::ChangedSubject (const char*&) { const char* dir = _dir->Text(); diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibvarviews.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibvarviews.h --- iv-3.1/iv/src/bin/ibuild/ibvarviews.h Fri Apr 24 22:15:01 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibvarviews.h Tue Apr 2 13:52:20 1996 @@ -27,6 +27,10 @@ #ifndef ibvarviews_h #define ibvarviews_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibviewer.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibviewer.c --- iv-3.1/iv/src/bin/ibuild/ibviewer.c Tue Nov 10 19:20:00 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibviewer.c Tue Apr 2 13:52:20 1996 @@ -31,6 +31,9 @@ #include "ibed.h" #include "ibvars.h" #include "ibvarviews.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibviewer.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibviewer.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibviewer.h --- iv-3.1/iv/src/bin/ibuild/ibviewer.h Fri Apr 24 22:15:01 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibviewer.h Tue Apr 2 13:52:20 1996 @@ -27,6 +27,10 @@ #ifndef ibviewer_h #define ibviewer_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibmessage.h" #include "ibgrblock.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibviewport.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibviewport.c --- iv-3.1/iv/src/bin/ibuild/ibviewport.c Fri Aug 28 17:53:01 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibviewport.c Tue Apr 2 13:52:20 1996 @@ -27,6 +27,9 @@ #include "ibclasses.h" #include "ibcmds.h" #include "ibvars.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ibviewport.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/ibviewport.h iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibviewport.h --- iv-3.1/iv/src/bin/ibuild/ibviewport.h Fri Apr 24 22:15:01 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/ibviewport.h Tue Apr 2 13:52:20 1996 @@ -27,6 +27,10 @@ #ifndef ibviewport_h #define ibviewport_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "ibscene.h" #include "ibgraphic.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ibuild/main.c iv-3.1-g++2.7.2/iv/src/bin/ibuild/main.c --- iv-3.1/iv/src/bin/ibuild/main.c Fri Apr 24 22:15:02 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ibuild/main.c Tue Apr 2 13:52:20 1996 @@ -20,6 +20,8 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +int iv_3_1l_inofficial_iv_fixes_enabled = 1; + /* * User interface builder main program. */ diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/iclass/classbuffer.c iv-3.1-g++2.7.2/iv/src/bin/iclass/classbuffer.c --- iv-3.1/iv/src/bin/iclass/classbuffer.c Sat Dec 12 05:35:28 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/iclass/classbuffer.c Tue Apr 2 13:52:21 1996 @@ -24,6 +24,9 @@ * ClassBuffer implementation. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "classbuffer.h" #include "classinfo.h" #include "direct.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/iclass/classbuffer.h iv-3.1-g++2.7.2/iv/src/bin/iclass/classbuffer.h --- iv-3.1/iv/src/bin/iclass/classbuffer.h Sat Dec 12 05:33:56 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/iclass/classbuffer.h Tue Apr 2 13:52:21 1996 @@ -27,10 +27,15 @@ #ifndef classbuffer_h #define classbuffer_h -#include +#ifdef __GNUG__ +#pragma interface +#endif -#include +#include #include +#include + +#include class Classes; class ClassInfo; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/iclass/classeditor.c iv-3.1-g++2.7.2/iv/src/bin/iclass/classeditor.c --- iv-3.1/iv/src/bin/iclass/classeditor.c Fri Mar 27 18:38:02 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/iclass/classeditor.c Tue Apr 2 13:52:21 1996 @@ -24,6 +24,9 @@ * ClassEditor implementation */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "classeditor.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/iclass/classeditor.h iv-3.1-g++2.7.2/iv/src/bin/iclass/classeditor.h --- iv-3.1/iv/src/bin/iclass/classeditor.h Fri Dec 8 21:44:24 1989 +++ iv-3.1-g++2.7.2/iv/src/bin/iclass/classeditor.h Tue Apr 2 13:52:21 1996 @@ -27,6 +27,10 @@ #ifndef classeditor_h #define classeditor_h +#ifdef __GNUG__ +#pragma interface +#endif + #include static const char* CEDone = "\r\t\007\033"; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/iclass/classinfo.c iv-3.1-g++2.7.2/iv/src/bin/iclass/classinfo.c --- iv-3.1/iv/src/bin/iclass/classinfo.c Sat Dec 12 05:37:09 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/iclass/classinfo.c Tue Apr 2 13:52:21 1996 @@ -24,6 +24,9 @@ * ClassInfo implementation. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "classinfo.h" #include "globals.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/iclass/classinfo.h iv-3.1-g++2.7.2/iv/src/bin/iclass/classinfo.h --- iv-3.1/iv/src/bin/iclass/classinfo.h Fri Dec 8 21:44:24 1989 +++ iv-3.1-g++2.7.2/iv/src/bin/iclass/classinfo.h Tue Apr 2 13:52:21 1996 @@ -27,6 +27,10 @@ #ifndef classinfo_h #define classinfo_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class ClassInfo { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/iclass/dialogs.c iv-3.1-g++2.7.2/iv/src/bin/iclass/dialogs.c --- iv-3.1/iv/src/bin/iclass/dialogs.c Wed Sep 23 18:45:09 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/iclass/dialogs.c Tue Apr 2 13:52:21 1996 @@ -24,6 +24,9 @@ * Implementation of various dialogs boxes. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "dialogs.h" #include @@ -37,15 +40,16 @@ #include #include #include +#include #include #include #include -#if !defined(AIXV3) && !defined(hpux) && !(defined(sun) && OSMajorVersion >= 5) +#if !defined(AIXV3) && !defined(hpux) && !(defined(sun) && OSMajorVersion >= 5) && !defined(linux) && !defined(sgi) /* sigh, not all systems have this prototype */ extern "C" { - char* getcwd(char*, int); + char* getcwd(char*, size_t); } #endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/iclass/dialogs.h iv-3.1-g++2.7.2/iv/src/bin/iclass/dialogs.h --- iv-3.1/iv/src/bin/iclass/dialogs.h Sat Dec 12 05:38:59 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/iclass/dialogs.h Tue Apr 2 13:52:21 1996 @@ -27,6 +27,10 @@ #ifndef dialogs_h #define dialogs_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class FileBrowser; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/iclass/direct.c iv-3.1-g++2.7.2/iv/src/bin/iclass/direct.c --- iv-3.1/iv/src/bin/iclass/direct.c Sat Dec 12 05:40:42 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/iclass/direct.c Tue Apr 2 13:52:22 1996 @@ -24,13 +24,18 @@ * Directory object implementation. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "direct.h" #include "globals.h" #include #include #include #include +#ifndef __alpha #include +#endif #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/iclass/direct.h iv-3.1-g++2.7.2/iv/src/bin/iclass/direct.h --- iv-3.1/iv/src/bin/iclass/direct.h Mon Jul 13 19:32:33 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/iclass/direct.h Tue Apr 2 13:52:22 1996 @@ -27,6 +27,10 @@ #ifndef direct_h #define direct_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class DirectoryRep; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/iclass/globals.c iv-3.1-g++2.7.2/iv/src/bin/iclass/globals.c --- iv-3.1/iv/src/bin/iclass/globals.c Mon Jul 13 19:32:34 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/iclass/globals.c Tue Apr 2 13:52:22 1996 @@ -24,6 +24,9 @@ * Implementation of global definitions. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "globals.h" #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/iclass/globals.h iv-3.1-g++2.7.2/iv/src/bin/iclass/globals.h --- iv-3.1/iv/src/bin/iclass/globals.h Fri Apr 12 08:37:19 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/iclass/globals.h Tue Apr 2 13:52:22 1996 @@ -27,6 +27,10 @@ #ifndef globals_h #define globals_h +#ifdef __GNUG__ +#pragma interface +#endif + extern char* strnew(const char*); extern char* strnnew(const char*, int); diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/iclass/iclass.c iv-3.1-g++2.7.2/iv/src/bin/iclass/iclass.c --- iv-3.1/iv/src/bin/iclass/iclass.c Fri Sep 11 18:20:22 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/iclass/iclass.c Tue Apr 2 13:52:22 1996 @@ -29,6 +29,9 @@ #include "classinfo.h" #include "dialogs.h" #include "globals.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "iclass.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/iclass/iclass.h iv-3.1-g++2.7.2/iv/src/bin/iclass/iclass.h --- iv-3.1/iv/src/bin/iclass/iclass.h Mon Jul 13 19:32:37 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/iclass/iclass.h Tue Apr 2 13:52:22 1996 @@ -27,6 +27,10 @@ #ifndef iclass_h #define iclass_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class ButtonState; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/iclass/main.c iv-3.1-g++2.7.2/iv/src/bin/iclass/main.c --- iv-3.1/iv/src/bin/iclass/main.c Fri Mar 27 18:40:42 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/iclass/main.c Tue Apr 2 13:52:22 1996 @@ -20,6 +20,8 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +int iv_3_1l_inofficial_iv_fixes_enabled = 1; + /* * InterViews class browser main program. */ diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idemo/main.c iv-3.1-g++2.7.2/iv/src/bin/idemo/main.c --- iv-3.1/iv/src/bin/idemo/main.c Fri Dec 11 23:39:03 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/idemo/main.c Tue Apr 2 13:52:22 1996 @@ -22,6 +22,8 @@ * OF THIS SOFTWARE. */ +int iv_3_1l_inofficial_iv_fixes_enabled = 1; + #include #include #include @@ -250,7 +252,7 @@ Style* s = style_; Transformer t; - float rotation; + float rotation = 0; s->find_attribute("rotation", rotation); t.rotate(rotation); Action* action = new ActionCallback(App)(this, &App::do_nothing); @@ -412,7 +414,9 @@ void App::green() { printf("green\n"); } void App::blue() { printf("blue\n"); } -void App::do_nothing() { printf("do nothing\n"); } +void App::do_nothing() { + printf("do nothing\n"); +} void App::quit() { delete main_; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/idarrow.c iv-3.1-g++2.7.2/iv/src/bin/idraw/idarrow.c --- iv-3.1/iv/src/bin/idraw/idarrow.c Mon Jul 13 19:46:07 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/idarrow.c Tue Apr 2 13:52:23 1996 @@ -24,6 +24,9 @@ * Implementation of ArrowLineComp, ArrowLineView, PSArrowLine */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "idarrow.h" #include "idarrows.h" #include "idvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/idarrow.h iv-3.1-g++2.7.2/iv/src/bin/idraw/idarrow.h --- iv-3.1/iv/src/bin/idraw/idarrow.h Thu Dec 12 00:49:17 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/idarrow.h Tue Apr 2 13:52:23 1996 @@ -28,6 +28,10 @@ #ifndef idarrow_h #define idarrow_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/idarrowhead.c iv-3.1-g++2.7.2/iv/src/bin/idraw/idarrowhead.c --- iv-3.1/iv/src/bin/idraw/idarrowhead.c Thu Dec 12 00:49:18 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/idarrowhead.c Tue Apr 2 13:52:23 1996 @@ -24,6 +24,9 @@ * Arrowhead implementation. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "idarrowhead.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/idarrowhead.h iv-3.1-g++2.7.2/iv/src/bin/idraw/idarrowhead.h --- iv-3.1/iv/src/bin/idraw/idarrowhead.h Thu Dec 12 00:49:19 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/idarrowhead.h Tue Apr 2 13:52:23 1996 @@ -27,6 +27,10 @@ #ifndef idarrowhead_h #define idarrowhead_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Arrowhead : public SF_Polygon { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/idarrows.c iv-3.1-g++2.7.2/iv/src/bin/idraw/idarrows.c --- iv-3.1/iv/src/bin/idraw/idarrows.c Mon Jul 13 19:46:09 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/idarrows.c Tue Apr 2 13:52:23 1996 @@ -25,6 +25,9 @@ */ #include "idarrowhead.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "idarrows.h" #include @@ -84,11 +87,9 @@ ArrowLine& ArrowLine::operator = (ArrowLine& aline) { Graphic::operator=(aline); - SetArrows(aline.Head(), aline.Tail()); - - if (Head()) *_head = *aline._head; - if (Tail()) *_tail = *aline._tail; _arrow_scale = aline.ArrowScale(); + SetPattern(aline.GetPattern()); + SetArrows(aline.Head(), aline.Tail()); return *this; } @@ -249,11 +250,9 @@ ArrowMultiLine& ArrowMultiLine::operator = (ArrowMultiLine& aml) { Graphic::operator=(aml); - SetArrows(aml.Head(), aml.Tail()); - - if (Head()) *_head = *aml._head; - if (Tail()) *_tail = *aml._tail; _arrow_scale = aml.ArrowScale(); + SetPattern(aml.GetPattern()); + SetArrows(aml.Head(), aml.Tail()); return *this; } @@ -429,11 +428,9 @@ ArrowOpenBSpline& ArrowOpenBSpline::operator = (ArrowOpenBSpline& aml) { Graphic::operator=(aml); - SetArrows(aml.Head(), aml.Tail()); - - if (Head()) *_head = *aml._head; - if (Tail()) *_tail = *aml._tail; _arrow_scale = aml.ArrowScale(); + SetPattern(aml.GetPattern()); + SetArrows(aml.Head(), aml.Tail()); return *this; } diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/idarrows.h iv-3.1-g++2.7.2/iv/src/bin/idraw/idarrows.h --- iv-3.1/iv/src/bin/idraw/idarrows.h Thu Dec 12 00:49:21 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/idarrows.h Tue Apr 2 13:52:23 1996 @@ -29,6 +29,10 @@ #ifndef idarrows_h #define idarrows_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/idcatalog.c iv-3.1-g++2.7.2/iv/src/bin/idraw/idcatalog.c --- iv-3.1/iv/src/bin/idraw/idcatalog.c Mon Sep 28 19:09:01 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/idcatalog.c Tue Apr 2 13:52:23 1996 @@ -24,6 +24,11 @@ * IdrawCatalog implementation. */ +#ifdef __GNUG__ +#pragma implementation "psformat.h" +#pragma implementation "idcatalog.h" +#endif + #include "idarrow.h" #include "idarrows.h" #include "idcatalog.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/idcatalog.h iv-3.1-g++2.7.2/iv/src/bin/idraw/idcatalog.h --- iv-3.1/iv/src/bin/idraw/idcatalog.h Sat Dec 12 05:10:57 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/idcatalog.h Tue Apr 2 13:52:23 1996 @@ -28,6 +28,10 @@ #ifndef idcatalog_h #define idcatalog_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class GraphicComp; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/idclasses.h iv-3.1-g++2.7.2/iv/src/bin/idraw/idclasses.h --- iv-3.1/iv/src/bin/idraw/idclasses.h Thu Dec 12 00:49:25 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/idclasses.h Tue Apr 2 13:52:24 1996 @@ -27,6 +27,10 @@ #ifndef idclasses_h #define idclasses_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #define ABOUT_CMD 1001 diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/idcmds.c iv-3.1-g++2.7.2/iv/src/bin/idraw/idcmds.c --- iv-3.1/iv/src/bin/idraw/idcmds.c Fri May 22 20:07:32 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/idcmds.c Tue Apr 2 13:52:24 1996 @@ -26,6 +26,9 @@ #include "ided.h" #include "idclasses.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "idcmds.h" #include "idcomp.h" #include "iddialogs.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/idcmds.h iv-3.1-g++2.7.2/iv/src/bin/idraw/idcmds.h --- iv-3.1/iv/src/bin/idraw/idcmds.h Mon Jul 13 19:46:12 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/idcmds.h Tue Apr 2 13:52:24 1996 @@ -27,6 +27,10 @@ #ifndef idcmds_h #define idcmds_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/idcomp.c iv-3.1-g++2.7.2/iv/src/bin/idraw/idcomp.c --- iv-3.1/iv/src/bin/idraw/idcomp.c Wed May 13 23:39:13 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/idcomp.c Tue Apr 2 13:52:24 1996 @@ -25,6 +25,9 @@ */ #include "idarrows.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "idcomp.h" #include "idcatalog.h" #include "idclasses.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/idcomp.h iv-3.1-g++2.7.2/iv/src/bin/idraw/idcomp.h --- iv-3.1/iv/src/bin/idraw/idcomp.h Thu Dec 12 00:49:30 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/idcomp.h Tue Apr 2 13:52:24 1996 @@ -27,6 +27,10 @@ #ifndef idcomp_h #define idcomp_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/idcreator.c iv-3.1-g++2.7.2/iv/src/bin/idraw/idcreator.c --- iv-3.1/iv/src/bin/idraw/idcreator.c Thu Dec 12 00:49:31 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/idcreator.c Tue Apr 2 13:52:24 1996 @@ -28,6 +28,9 @@ #include "idclasses.h" #include "idcmds.h" #include "idcomp.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "idcreator.h" #include "idvars.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/idcreator.h iv-3.1-g++2.7.2/iv/src/bin/idraw/idcreator.h --- iv-3.1/iv/src/bin/idraw/idcreator.h Thu Dec 12 00:49:32 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/idcreator.h Tue Apr 2 13:52:24 1996 @@ -27,6 +27,10 @@ #ifndef idcreator_h #define idcreator_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class IdrawCreator : public Creator { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/iddialogs.c iv-3.1-g++2.7.2/iv/src/bin/idraw/iddialogs.c --- iv-3.1/iv/src/bin/idraw/iddialogs.c Wed Jun 24 20:30:07 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/iddialogs.c Tue Apr 2 13:52:25 1996 @@ -24,6 +24,9 @@ * Implementation of Idraw-specific dialog boxes. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "iddialogs.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/iddialogs.h iv-3.1-g++2.7.2/iv/src/bin/idraw/iddialogs.h --- iv-3.1/iv/src/bin/idraw/iddialogs.h Thu Dec 12 00:49:34 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/iddialogs.h Tue Apr 2 13:52:25 1996 @@ -27,6 +27,10 @@ #ifndef iddialogs_h #define iddialogs_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class MoveDialog : public BasicDialog { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/ided.c iv-3.1-g++2.7.2/iv/src/bin/idraw/ided.c --- iv-3.1/iv/src/bin/idraw/ided.c Wed Nov 4 19:03:20 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/ided.c Tue Apr 2 13:52:25 1996 @@ -29,6 +29,9 @@ #include "idclasses.h" #include "idcmds.h" #include "idcomp.h" +#ifdef __GNUG__ +#pragma implementation +#endif #include "ided.h" #include "idkybd.h" #include "idvars.h" @@ -228,7 +231,6 @@ IdrawEditor::~IdrawEditor () { delete _keymap; delete _selection; - delete _modifStatus; delete _name; delete _modifStatus; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/ided.h iv-3.1-g++2.7.2/iv/src/bin/idraw/ided.h --- iv-3.1/iv/src/bin/idraw/ided.h Mon Jul 13 19:46:14 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/ided.h Tue Apr 2 13:52:25 1996 @@ -27,6 +27,10 @@ #ifndef ided_h #define ided_h +#ifdef __GNUG__ +#pragma interface +#endif + #include "idcomp.h" #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/idkybd.c iv-3.1-g++2.7.2/iv/src/bin/idraw/idkybd.c --- iv-3.1/iv/src/bin/idraw/idkybd.c Thu Dec 12 00:49:38 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/idkybd.c Tue Apr 2 13:52:25 1996 @@ -24,6 +24,9 @@ * Idraw keycode values. */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "idkybd.h" const char* KLBL_ABOUT = "$", *CODE_ABOUT = "$"; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/idkybd.h iv-3.1-g++2.7.2/iv/src/bin/idraw/idkybd.h --- iv-3.1/iv/src/bin/idraw/idkybd.h Thu Dec 12 00:49:39 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/idkybd.h Tue Apr 2 13:52:25 1996 @@ -27,6 +27,10 @@ #ifndef idkybd_h #define idkybd_h +#ifdef __GNUG__ +#pragma interface +#endif + extern const char* KLBL_ABOUT, *CODE_ABOUT; extern const char* KLBL_NEWVIEW, *CODE_NEWVIEW; extern const char* KLBL_PMOVE, *CODE_PMOVE; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/idvars.c iv-3.1-g++2.7.2/iv/src/bin/idraw/idvars.c --- iv-3.1/iv/src/bin/idraw/idvars.c Thu Jul 30 23:23:07 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/idvars.c Tue Apr 2 13:52:25 1996 @@ -24,6 +24,9 @@ * Implementation of idraw-specific state variables */ +#ifdef __GNUG__ +#pragma implementation +#endif #include "idvars.h" #include "idclasses.h" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/idvars.h iv-3.1-g++2.7.2/iv/src/bin/idraw/idvars.h --- iv-3.1/iv/src/bin/idraw/idvars.h Thu Dec 12 00:49:42 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/idvars.h Tue Apr 2 13:52:25 1996 @@ -27,6 +27,10 @@ #ifndef idvars_h #define idvars_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/idraw/main.c iv-3.1-g++2.7.2/iv/src/bin/idraw/main.c --- iv-3.1/iv/src/bin/idraw/main.c Fri May 22 20:12:25 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/idraw/main.c Tue Apr 2 13:52:26 1996 @@ -20,6 +20,8 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +int iv_3_1l_inofficial_iv_fixes_enabled = 1; + /* * Idraw editor main program. */ diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/ifc/main.c iv-3.1-g++2.7.2/iv/src/bin/ifc/main.c --- iv-3.1/iv/src/bin/ifc/main.c Tue Nov 10 20:05:48 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/ifc/main.c Tue Apr 2 13:52:26 1996 @@ -20,6 +20,8 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +int iv_3_1l_inofficial_iv_fixes_enabled = 1; + /* * File chooser main program. */ diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/logo/main.c iv-3.1-g++2.7.2/iv/src/bin/logo/main.c --- iv-3.1/iv/src/bin/logo/main.c Fri Dec 21 01:11:28 1990 +++ iv-3.1-g++2.7.2/iv/src/bin/logo/main.c Tue Apr 2 13:52:26 1996 @@ -20,6 +20,8 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +int iv_3_1l_inofficial_iv_fixes_enabled = 1; + #include "logo.h" #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/mailbox/main.c iv-3.1-g++2.7.2/iv/src/bin/mailbox/main.c --- iv-3.1/iv/src/bin/mailbox/main.c Fri Sep 11 18:19:22 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/mailbox/main.c Tue Apr 2 13:52:26 1996 @@ -20,6 +20,8 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +int iv_3_1l_inofficial_iv_fixes_enabled = 1; + /* * Watch a mailbox and display its contents. */ diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/scripts/Imakefile iv-3.1-g++2.7.2/iv/src/bin/scripts/Imakefile --- iv-3.1/iv/src/bin/scripts/Imakefile Fri Sep 13 00:01:39 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/scripts/Imakefile Tue Apr 2 13:52:26 1996 @@ -2,10 +2,19 @@ XCOMM scripts - miscellaneous shell scripts XCOMM +XCOMM +XCOMM For Linux: +XCOMM redefine EXTRA_CCDEFINES so that cpp uses -traditional +XCOMM +#ifdef LinuxArchitecture + EXTRA_CCDEFINES = -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE \ @@\ + -D_GNU_SOURCE -traditional +#endif + /* - * We assume X11 already has bsdinst and/or mkdirhier in its BINDIR. + * We assume X11 already has mkdirhier in its BINDIR. */ -PROGRAMS = cpu ibmkmf ivmkmf remind +PROGRAMS = bsdinst cpu ibmkmf ivmkmf remind CONFIGDIRSPEC = -T IMAKE_TEMPLATE -I$(ABSCONFIGDIR) -I$(XCONFIGDIR) REMIND_MACROS = /usr/local/lib/remind/macros diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/scripts/chgsuffix.sh iv-3.1-g++2.7.2/iv/src/bin/scripts/chgsuffix.sh --- iv-3.1/iv/src/bin/scripts/chgsuffix.sh Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/bin/scripts/chgsuffix.sh Tue Apr 2 13:52:26 1996 @@ -0,0 +1,8 @@ +#!/bin/sh +#set -x +if [ "$1" \!= "$2" ]; then + # recursively change suffix in $1 for suffix in $2 + find . -type f -name "*.$1" -print -o -type d -name TIFF -prune | \ + sed "s/^\(.*\)$1/mv \1$1 \1$2" | \ + sh +fi diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/scripts/cpu iv-3.1-g++2.7.2/iv/src/bin/scripts/cpu --- iv-3.1/iv/src/bin/scripts/cpu Mon Dec 14 18:29:21 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/scripts/cpu Thu Jan 1 01:00:00 1970 @@ -1,6 +0,0 @@ -#!/bin/sh -# -# print a "hardware name" to identify this machine -# - -echo "SGI" diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/scripts/ibmkmf iv-3.1-g++2.7.2/iv/src/bin/scripts/ibmkmf --- iv-3.1/iv/src/bin/scripts/ibmkmf Mon Dec 14 18:29:22 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/scripts/ibmkmf Thu Jan 1 01:00:00 1970 @@ -1,61 +0,0 @@ -#! /bin/csh -f -# -# Generate a Makefile for ibuild -# - -if ($1 == "-m") then - set ccsuffix = $2 - set name = $3 - set dest = `basename $3` - set imakefile = $name-imake - set makefile = $name-make - set aout = $name.exe - - shift argv - shift argv - shift argv - - if (-f $imakefile) then - rm -f $imakefile.bak - mv $imakefile $imakefile.bak - endif - - echo "XCOMM DO NOT EDIT -- generated by ibmkmf" > $imakefile - echo " " >> $imakefile - - echo "SPECIAL_IMAKEFLAGS = \" >> $imakefile - echo " -f $imakefile -s $makefile -DUseInstalled -DTurnOptimizingOn=0" \ - >> $imakefile - echo " " >> $imakefile - echo "CCSUFFIX = $ccsuffix" >> $imakefile - echo " " >> $imakefile - - echo "SRCS = \" >> $imakefile - foreach i ($argv) - echo " $i."'$(CCSUFFIX) \' >> $imakefile - end - echo " $name-main."'$(CCSUFFIX)' >> $imakefile - echo "OBJS = \" >> $imakefile - foreach i ($argv) - echo " $i.o \" >> $imakefile - end - echo " $name-main.o" >> $imakefile - echo "AOUT = $aout" >> $imakefile - echo " " >> $imakefile - - echo "Use_libUnidraw()" >> $imakefile - echo "Use_2_6()" >> $imakefile - echo "ComplexProgramTarget($dest)" >> $imakefile - echo " " >> $imakefile - - echo "MakeObjectRule($name-main,$name-main,NullParameter)" >> $imakefile - foreach i ($argv) - echo "MakeObjectRule($i,$i,NullParameter)" >> $imakefile - end - -else - set imakefile = $1-imake - set makefile = $1-make - imake -T "InterViews/template" -I/interviews/config -I/usr/lib/X11/config \ - -f $imakefile -s $makefile -DUseInstalled -DTurnOptimizingOn=0 -endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/scripts/ibmkmf.cpp iv-3.1-g++2.7.2/iv/src/bin/scripts/ibmkmf.cpp --- iv-3.1/iv/src/bin/scripts/ibmkmf.cpp Mon Jun 8 21:46:44 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/scripts/ibmkmf.cpp Tue Apr 2 13:52:26 1996 @@ -24,7 +24,7 @@ echo " " >> $imakefile echo "SPECIAL_IMAKEFLAGS = \" >> $imakefile - echo " -f $imakefile -s $makefile -DUseInstalled -DTurnOptimizingOn=0" \ + echo " -f $imakefile -s $makefile -DIVUseInstalled -DTurnOptimizingOn=0" \ >> $imakefile echo " " >> $imakefile echo "CCSUFFIX = $ccsuffix" >> $imakefile @@ -57,5 +57,5 @@ set imakefile = $1-imake set makefile = $1-make imake CONFIGDIRSPEC \ - -f $imakefile -s $makefile -DUseInstalled -DTurnOptimizingOn=0 + -f $imakefile -s $makefile -DIVUseInstalled -DTurnOptimizingOn=0 endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/scripts/ivmkmf iv-3.1-g++2.7.2/iv/src/bin/scripts/ivmkmf --- iv-3.1/iv/src/bin/scripts/ivmkmf Mon Dec 14 18:29:22 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/scripts/ivmkmf Thu Jan 1 01:00:00 1970 @@ -1,36 +0,0 @@ -#!/bin/sh -# -# generate a Makefile from an Imakefile outside of the source tree -# - -usage="usage: $0 [-a]" -do_all= - -case "$#" in - 0) ;; - 1) case "$1" in - -a) do_all="yes" - ;; - *) echo "$usage" 1>&2; exit 1 - ;; - esac - ;; - *) echo "$usage" 1>&2; exit 1 - ;; -esac - -if [ -f Makefile ]; then - rm -f Makefile.bak - mv Makefile Makefile.bak -fi - -case "$do_all" in - yes) set -x - imake -T "InterViews/template" -I/interviews/config -I/usr/lib/X11/config -DUseInstalled && - make Makefiles && - make depend - ;; - *) set -x - imake -T "InterViews/template" -I/interviews/config -I/usr/lib/X11/config -DUseInstalled - ;; -esac diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/scripts/ivmkmf.cpp iv-3.1-g++2.7.2/iv/src/bin/scripts/ivmkmf.cpp --- iv-3.1/iv/src/bin/scripts/ivmkmf.cpp Fri Sep 13 00:03:50 1991 +++ iv-3.1-g++2.7.2/iv/src/bin/scripts/ivmkmf.cpp Tue Apr 2 13:52:26 1996 @@ -26,11 +26,11 @@ case "$do_all" in yes) set -x - imake CONFIGDIRSPEC -DUseInstalled && + imake CONFIGDIRSPEC -DIVUseInstalled && make Makefiles && make depend ;; *) set -x - imake CONFIGDIRSPEC -DUseInstalled + imake CONFIGDIRSPEC -DIVUseInstalled ;; esac diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/bin/scripts/remind iv-3.1-g++2.7.2/iv/src/bin/scripts/remind --- iv-3.1/iv/src/bin/scripts/remind Mon Dec 14 18:29:23 1992 +++ iv-3.1-g++2.7.2/iv/src/bin/scripts/remind Thu Jan 1 01:00:00 1970 @@ -1,77 +0,0 @@ -: remind - post reminders for today from calendar file - -Remind=remind - -CalendarHelper=/usr/lib/calprog - -MacrosFile=/usr/local/lib/remind/macros -RemindersFile=$HOME/reminders -AltRemindersFile=$HOME/calendar -NroffPrefix='.po 0;.ll 50;.pl 50;.nh;.na;' -NroffPostfix=';.br;.pl 1' -TrMapIn=';\001\002\003' # ; ^A ^B ^C -TrMapOut='\012\047;\134' # CR ' ; \ - -: ${ALERTER=alert}; export ALERTER -: ${DISPLAY=:0}; export DISPLAY -export TESTREMIND -SHELL=/bin/sh; export SHELL - -if test ! -f $RemindersFile -then - RemindersFile=$AltRemindersFile -fi - -case $# in - -0) set `date`; day=$1; tmp=/tmp/rem$$ - -$CalendarHelper | awk ' - NR==1 || NR==2 { print } - END { print "([Ee]very[ ]*)(" "'"$day"'" "|day)" } -' > $tmp - -cat $MacrosFile $RemindersFile \ - | /lib/cpp \ - | egrep -f $tmp \ - | awk ' - /[0-9][0-9]?:[0-9][0-9]?/ { - for ( i=1; i<=NF; i++ ) { - if ( $i ~ /^[0-9][0-9]?:[0-9][0-9]/ ) { - split( $i, time, ":"); - suffix = substr( time[2], 3, 2 ); - time[2] = substr( time[2], 1, 2 ); - if ( suffix == "pm" || substr( $(i+1), 1, 2 ) == "pm" ) { - time[1] = time[1] + 12; - } - if ( time[1] < 10 ) { - time[1] = "0" time[1]; - } - print "echo '\''" $0 "'\'' | '$Remind' " time[1] time[2]; - break; - } - } - } '\ - | sh - -rm -f $tmp ;; - -1) read input - input="'$input'" - while read line - do input="$input '$line'" - done - if test $1 -eq 0 -o ${TESTREMIND-no}test != notest - then DO="sh" - else DO="at $1" - fi - - echo " echo '$NroffPrefix'$input'$NroffPostfix' | tr ';' '\\012' | nroff | $ALERTER " | $DO - ;; - - -2) echo $2 | $Remind $1 ;; - -*) echo "usage : $0 [time] [message]" ;; - -esac diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/config/InterViews/TIFF.def iv-3.1-g++2.7.2/iv/src/config/InterViews/TIFF.def --- iv-3.1/iv/src/config/InterViews/TIFF.def Sat Dec 12 00:33:54 1992 +++ iv-3.1-g++2.7.2/iv/src/config/InterViews/TIFF.def Tue Apr 2 13:52:27 1996 @@ -5,8 +5,8 @@ #define TIFFCDriver CcCmd #endif -#if defined(OptimizedCDebugFlags) && !defined(TIFFOptimizeCFlags) -#define TIFFOptimizeCFlags OptimizedCDebugFlags +#if defined(OptimizedCFlags) && !defined(TIFFOptimizeCFlags) +#define TIFFOptimizeCFlags OptimizedCFlags #endif #if defined(DefaultCCOptions) && !defined(TIFFExtraCFlags) @@ -116,6 +116,11 @@ -DCOLORIMETRY_SUPPORT -DYCBCR_SUPPORT \ -DHAVE_IEEEFP=1 -DUSE_VARARGS=1 -DUSE_PROTOTYPES=0 #endif +#if defined(AlphaArchitecture) +#define TIFFStdCDefines \ + -DCOLORIMETRY_SUPPORT -DJPEG_SUPPORT -DYCBCR_SUPPORT -DCMYK_SUPPORT \ + -DHAVE_IEEEFP=1 -DUSE_VARARGS=0 -DUSE_PROTOTYPES=1 -DUSE_CONST=1 +#endif #if defined(NeXTArchitecture) #define TIFFStdCDefines \ -DCOLORIMETRY_SUPPORT -DJPEG_SUPPORT -DYCBCR_SUPPORT -DCMYK_SUPPORT \ @@ -172,7 +177,7 @@ #endif #ifndef TIFFStdCIncludes -#ifdef UseInstalled +#ifdef TIFFUseInstalled #define TIFFStdCIncludes -I$(INCDIR)/TIFF #else #define TIFFStdCIncludes -I$(INCSRC)/TIFF @@ -192,7 +197,8 @@ */ #ifndef TIFFCLdFlags #define TIFFCLdFlags\ - $(TIFF_CFLAGS) $(TIFF_EXTRA_CLDFLAGS) $(TIFF_EXTRA_CLDLIBS) + $(TIFF_CDEFINES) $(TIFF_CINCLUDES) $(TIFF_EXTRA_CFLAGS)\ + $(TIFF_EXTRA_CLDFLAGS) $(TIFF_EXTRA_CLDLIBS) #endif #ifndef TIFFExtraCLdFlags diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/config/InterViews/arch.def iv-3.1-g++2.7.2/iv/src/config/InterViews/arch.def --- iv-3.1/iv/src/config/InterViews/arch.def Sat Dec 12 00:34:52 1992 +++ iv-3.1-g++2.7.2/iv/src/config/InterViews/arch.def Tue Apr 2 13:52:27 1996 @@ -385,6 +385,35 @@ #define MacroFile InterViews/iv-convex.cf #endif /* __convex__ */ +#ifdef stratus +#undef stratus +#define StratusArchitecture +#define ArchitectureName stratus +#define architectureName stratus +#define MacroIncludeFile +#define MacroFile InterViews/iv-stratus.cf +#endif + +#ifdef __alpha +#undef ALPHA +#undef alpha +#define AlphaArchitecture +#define ArchitectureName ALPHA +#define architectureName alpha +#define MacroIncludeFile +#define MacroFile InterViews/iv-alpha.cf +#endif /* __alpha */ + +#ifdef __alpha +#undef ALPHA +#undef alpha +#define AlphaArchitecture +#define ArchitectureName ALPHA +#define architectureName alpha +#define MacroIncludeFile +#define MacroFile InterViews/iv-alpha.cf +#endif /* __alpha */ + #ifndef ArchitectureName XCOMM WARNING: Imakefile not configured; guessing at definitions!!! XCOMM This might mean that BOOTSTRAPCFLAGS was not set when building imake. diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/config/InterViews/cxx.def iv-3.1-g++2.7.2/iv/src/config/InterViews/cxx.def --- iv-3.1/iv/src/config/InterViews/cxx.def Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/config/InterViews/cxx.def Tue Apr 2 13:52:27 1996 @@ -0,0 +1,65 @@ +/* + * Definitions for DEC cxx + */ + +#undef LanguageCCDefines +#define LanguageCCDefines -Dcplusplus_2_1 + +#undef CCDriver +#define CCDriver cxx + +#undef DependCCFlags +#define DependCCFlags -I/usr/include/cxx $(CCDEFINES) $(CCINCLUDES) -D__DECCXX + +/* + * Not defined, I don't know why. + */ +#define ExtraCCDefines -D__STDC__ + +#undef CCSuffix +#define CCSuffix cxx /* might want cc, cxx, C, etc. */ +/* + * Definitions for DEC cxx + */ + +#undef LanguageCCDefines +#define LanguageCCDefines -Dcplusplus_2_1 + +#undef CCDriver +#define CCDriver cxx + +#undef DependCCFlags +#define DependCCFlags -I/usr/include/cxx $(CCDEFINES) $(CCINCLUDES) + +#undef CCSuffix + +/* + * When dynamic link works, we might want to change that. + */ +#if HasSharedLibraries +/*#define HasSunOSSharedLibraries YES */ +#define HasSunOSSharedLibraries NO +#endif + +#undef SharedCCFlags +#define SharedCCFlags /**/ + +#undef NonSharedCCLdFlags +#if defined(UseNonShared) && defined(InObjectCodeDir) +#define NonSharedCCLdFlags -batch +#else +#define NonSharedCCLdFlags /**/ +#endif + +#undef NormalSunOSSharedLibraryTarget +#define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\ +AOUT = Concat(lib,libname.so) @@\ +SHARED_CCFLAGS = SharedCCFlags @@\ + @@\ +AllTarget(Concat(lib,libname.so)) @@\ + $(LD) -shared -no_archive -o $@~ ldobjs @@\ + $(RM) $@ @@\ + $(MV) $@~ $@ @@\ + @@\ +clean:: @@\ + $(RM) Concat(lib,libname.so) diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/config/InterViews/gcc.def iv-3.1-g++2.7.2/iv/src/config/InterViews/gcc.def --- iv-3.1/iv/src/config/InterViews/gcc.def Wed Sep 9 00:38:37 1992 +++ iv-3.1-g++2.7.2/iv/src/config/InterViews/gcc.def Tue Apr 2 23:30:37 1996 @@ -1,5 +1,7 @@ /* * Definitions for gcc/g++. + * + * included in local.def */ #undef LanguageCCDefines @@ -9,13 +11,71 @@ #define CCDriver g++ #endif +#ifndef CcCmd +#define CcCmd gcc +#endif + +/* Don't know where LdCmd gets defined - but it is on linux. */ +/* I _want_ g++ to link! */ +#undef LdCmd +#ifndef LdCmd +#define LdCmd g++ +#endif + +#if defined(SunArchitecture) +# ifndef TIFFStdCDefines +# define TIFFStdCDefines \ + -DCOLORIMETRY_SUPPORT -DYCBCR_SUPPORT \ + -DHAVE_IEEEFP=1 -DUSE_VARARGS=0 -DUSE_PROTOTYPES=1 +# endif +#endif + #ifndef DependCCFlags -#define DependCCFlags $(CCDEFINES) $(CCINCLUDES) +# define DependCCFlags $(CCDEFINES) $(CCINCLUDES) #endif -#ifndef ExtraCCLdLibs -#define ExtraCCLdLibs -lg++ +#if defined(UseDebug) +# undef OptimizeCCFlags +# define OptimizeCCFlags +# if defined(NonSharedCCLdFlags) +# undef NonSharedCCLdFlags +# define NonSharedCCLdFlags -static +# endif +#else +# undef OptimizeCCFlags +# if defined(LinuxArchitecture) +# define OptimizeCCFlags -O6 -pipe +# elif defined(AlphaArchitecture) + /* there are some problems e.g. with file selector boxes + * that go away if optimization is turned off. + * Somebody should take a look at it. + * Currently I don't see another error; if you get some run time + * failure that goes away when building the debug version, you might + * try to replace -O6 by -O0 here. + * If you've found the erroneous module, you should mark it in the + * Imakefile. + */ +# define OptimizeCCFlags -O6 +# else +# define OptimizeCCFlags -O6 +# endif #endif #undef HasSunOSSharedLibraries #define HasSunOSSharedLibraries NO + +/* + * Right now, libg++ cannot be used to build the RPC classes. + */ +#undef BuildRPCClasses +#define BuildRPCClasses NO + +/* + * I don't trust the X defaults - ht + * DefaultCCOptions on linux are defined as ``-DNO_ASM -ansi'' + * but -ansi leads to warnings in stdlib.h + */ +#ifdef LinuxArchitecture +# undef DefaultCCOptions +# define DefaultCCOptions /**/ +#endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/config/InterViews/iv-alpha-cxx.cf iv-3.1-g++2.7.2/iv/src/config/InterViews/iv-alpha-cxx.cf --- iv-3.1/iv/src/config/InterViews/iv-alpha-cxx.cf Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/config/InterViews/iv-alpha-cxx.cf Tue Apr 2 18:38:12 1996 @@ -0,0 +1,327 @@ +/* + * Works in OSF1 V1.2 with CXX V1.2 and V1.3 + * Done on Wed Aug 11 16:15:29 1993 by Jean-Daniel Fekete (jdf@lri.lri.fr) + * + * Note for shared libraries: + * On OSF1, the linker produces a dynamic library in a way very similar to + * an executable. It need to have all the dependant libraries in order + * to check for unresolved symbols. + * Therefore, I need to refer to CCLDFLAGS in the + * NormalDynamicSharedLibraryTarget rule. The CCLDFLAGS has to be valid + * so the rule "Use_libFresco()" is added in NormalDynamicSharedLibraryTarget. + * However, for building libFresco.so, the LIBFRESCO macro should be undefined + * to avoid a cyclic dependency. + * Finally, OSF1 needs to have a variable named LD_LIBRARY_PATH defined + * with the path of the dynamic libraries when a program is started. There + * is no handy way to express that path at link time. Therefore, I have + * added a target named "rpath". typing "make rpath" in the directory of + * an executable using dynamic shared libraries prints the value expected + * by the dynamic linker to work. This value can be put in LD_LIBRARY_PATH + * by the following line: + * csh> setenv LD_LIBRARY_PATH `make rpath` + * or + * sh> LD_LIBRARY_PATH=`make rpath`; export LD_LIBRARY_PATH + * + */ + +#include + +/* + * StandardDefines is: -DDEC -DR5_XLIB SMTDEFINES + * Unfortunately, SMTDEFINES expands to -DSMT which make Xlib.h include + * Xproto.h. + * Xproto.h overrides the definitions of Window, Cursor etc. made by + * Fresco. + */ +#undef StandardDefines +#define StandardDefines -DDEC -DR5_XLIB + +/* + * On Alpha architecture, ieee's exception don't be recovered good. + * We need it. Followings is equal to -ieee_with_inexact opt. of CC. + * + * uncomment it if you are using cxx + */ +/* +#define ExtraCCFlags -D_IEEE_FP_INEXACT -D_IEEE_FP -Wc,-fptm,sui,-ieee_eflag,-resumption_safe,-scope_safe -Wb,-resumption_safe,-scope_safe +#define TIFFExtraCFlags -D_IEEE_FP_INEXACT -D_IEEE_FP -Wc,-fptm,sui,-ieee_eflag,-resumption_safe,-scope_safe -Wb,-resumption_safe,-scope_safe +*/ + +/* + * On OSF1, libX11 is compiled with decnet support. When we don't have + * decnet, we need a stub library to avoid undefined. + */ +#define ExtraCCLdLibs -ldnet_stub + +/* + * uncomment this if you are using cxx + */ +/* +#include +*/ + +/* + * osf1.cf defines #define StandardIncludes -I$(CROSSBASE)/usr/include + * which expands here to -I/usr/include. Therefore, /usr/include is loaded + * prior to other defines. + * Remove it. + */ +#undef StandardIncludes + +/* + * ImakeCmd is supposed defined too. osf1.cf defines it as + * $(IMAKESRC)/imake.local + */ +#undef ImakeCmd +#define ImakeCmd imake + +/* + * Same for the InstallCmd + */ +#undef InstallCmd +#define InstallCmd /usr/bin/X11/install.sh + +#undef DefaultCCOptions + +#include + +#if HasSharedLibraries +# define HasSunOSSharedLibraries NO +# if defined(UseDebug) && defined(InObjectCodeDir) +# undef HasOsf1SharedLibraries +# undef UseNonShared +# define UseNonShared YES +# else +# define HasOsf1SharedLibraries YES +# endif +#endif + +#undef SharedCCFlags +#if defined(UseNonShared) && defined(InObjectCodeDir) +# define SharedCCFlags /**/ +# undef HasOsf1SharedLibraries +# define HasOsf1SharedLibraries NO +#else +# define SharedCCFlags -shared +#endif + +/* + * Define the locations of cxx libs. + */ + +#ifndef CxxLibDir +# define CxxLibDir /usr/lib/cmplrs/cxx +#endif +#ifndef UsrShLibDir +# define UsrShLibDir /usr/shlib +#endif + +#ifndef CxxShLibDir +# define CxxShLibDir /usr/lib/cmplrs/cxx +#endif + +#ifndef UsrLocalShLibDir +# define UsrLocalShLibDir /usr/local/lib +#endif + +/* + * Define where the so_locations files stand. + */ + +#ifndef UsrShlibLocations +# define UsrShlibLocations $(USRSHLIBDIR)/so_locations +#endif + +#ifndef CxxLibLocations +# define CxxLibLocations $(CXXSHLIBDIR)/so_locations +#endif + +#ifndef UsrLocalLibLocations +# define UsrLocalLibLocations $(USRLOCALSHLIBDIR)/so_locations +#endif + +#ifndef CheckUsrShlibLocations +# ifdef UsrShlibLocations + /* use thisone for cxx */ +/* +# define CheckUsrShlibLocations -check_registry UsrShlibLocations +*/ + /* and thisone for g++ */ +# define CheckUsrShlibLocations -Wl,-check_registry,UsrShlibLocations +# else +# define CheckUsrShlibLocations /**/ +# endif +#endif + +#ifndef CheckCxxLibLocations +# ifdef CxxLibLocations + /* use thisone for cxx */ +/* +# define CheckCxxLibLocations -check_registry CxxLibLocations +*/ + /* and thisone for g++ */ +# define CheckCxxLibLocations -Wl,-check_registry,CxxLibLocations +# else +# define CheckCxxLibLocations /**/ +# endif +#endif + +#ifndef CheckUsrLocalLibLocations +# ifdef UsrLocalLibLocations + /* use thisone for cxx */ +/* +# define CheckUsrLocalLibLocations -update_registry UsrLocalLibLocations +*/ +# define CheckUsrLocalLibLocations -Wl,-update_registry,UsrLocalLibLocations +# else +# define CheckUsrLocalLibLocations /**/ +# endif +#endif + +#ifndef CheckRegistry +# define CheckRegistry \ @@\ + $(USRSHLIB_SO_LOCATION)\ @@\ + $(CXXLIB_SO_LOCATION)\ @@\ + $(USRLOCALLIB_SO_LOCATION) +#endif + +#ifndef CxxLibDirPath +# ifdef CxxLibDir +# define CxxLibDirPath -L$(CXXLIBDIR) +# else +# define CxxLibDirPath /**/ +# endif +#endif + CXXLIBDIR = CxxLibDir + CXXLIBDIRPATH = CxxLibDirPath + + USRSHLIBDIR = UsrShLibDir + CXXSHLIBDIR = CxxShLibDir + USRLOCALSHLIBDIR = UsrLocalShLibDir + + USRSHLIB_SO_LOCATION = CheckUsrShlibLocations + CXXLIB_SO_LOCATION = CheckCxxLibLocations + USRLOCALLIB_SO_LOCATION = CheckUsrLocalLibLocations + + CHECK_REGISTRY = CheckRegistry + +/* use this for gcc */ +#undef NonSharedCCLdFlags +#if defined(UseNonShared) && defined(InObjectCodeDir) +# define NonSharedCCLdFlags -static +#else +# define NonSharedCCLdFlags +#endif + +/* use this for cxx */ +/* +#undef NonSharedCCLdFlags +#if defined(UseNonShared) && defined(InObjectCodeDir) +# define NonSharedCCLdFlags -non_shared +#else +# define NonSharedCCLdFlags -call_shared +#endif +*/ + +/* use this one for cxx */ +/* +#ifndef NormalOsf1SharedLibraryTarget +# define NormalOsf1SharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\ +AOUT = Concat(lib,libname.so) @@\ + @@\ +AllTarget(Concat(lib,libname.so)) @@\ + @@\ +Concat(lib,libname.so): depobjs @@\ + $(RM) $@ @@\ + $(LD) -shared $(CHECK_REGISTRY) \ @@\ + -o $@ -all ldobjs -set_version rev \ @@\ + -soname $@ -none $(CCLDLIBS) \ @@\ + $(CXXLIBDIRPATH) -lcxx -lexc -lc +#endif +*/ + +/* and this one for gcc */ +#ifndef NormalOsf1SharedLibraryTarget +# define NormalOsf1SharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\ +LD = g++ @@\ +AOUT = Concat(lib,libname.so) @@\ + @@\ +AllTarget(Concat(lib,libname.so)) @@\ + @@\ +Concat(lib,libname.so): depobjs @@\ + $(RM) $@ @@\ + $(LD) -O2 -shared $(CHECK_REGISTRY) \ @@\ + -o $@ -Wl,-all ldobjs -Wl,-set_version,rev \ @@\ + -Wl,-soname,$@ -Wl,-none $(CCLDLIBS) @@\ + @@\ +clean:: @@\ + $(RM) Concat(lib,libname.so) +#endif + +/* + * Install a library. + */ +#ifndef InstallOsf1SharedLibrary +#define InstallOsf1SharedLibrary(libname,rev,dest) @@\ +install:: Concat(lib,libname.so) @@\ + MakeDir(dest) @@\ + $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so) dest +#endif + +/* + * Make either a shared library or a non-shared library. + */ +#ifndef NormalLibraryTarget +# if HasOsf1SharedLibraries +# define NormalLibraryTarget(libname,rev,depobjs,ldobjs) @@\ +NormalOsf1SharedLibraryTarget(libname,rev,depobjs,ldobjs) +# else +# define NormalLibraryTarget(libname,rev,depobjs,ldobjs) @@\ +NormalNonSharedLibraryTarget(libname,depobjs,ldobjs) +# endif +#endif + +#ifndef InstallLibrary +# if HasOsf1SharedLibraries +# define InstallLibrary(libname,rev,dest) @@\ +InstallOsf1SharedLibrary(libname,rev,dest) +# else +# define InstallLibrary(libname,rev,dest) @@\ +InstallNonSharedLibrary(libname,dest) +# endif +#endif + +#ifndef DepPath +# if IVUseInstalled +# define DepPath(name) /* as nothing */ +# else +# if HasOsf1SharedLibraries +# define DepPath(name) Concat($(LIBSRC)/name/$(ARCH)/lib,name.so) +# else +# define DepPath(name) Concat($(LIBSRC)/name/$(ARCH)/lib,name.a) +# endif +# endif +#endif + +#define MakeWorld(flags) @@\ +MakeNormalWorld(flags) @@\ +MakeSpecialWorld(.debug,flags) @@\ +MakeSpecialWorld(.noshared,flags) + +#define MakeInSubdirs(dirs) @@\ +MakefilesSubdirs(dirs) @@\ +DependSubdirs(dirs) @@\ +MakeSubdirs(dirs) @@\ +InstallSubdirs(dirs) @@\ +CleanSubdirs(dirs) @@\ +SpecialTargets(debug,-DUseDebug) @@\ +SpecialTargets(noshared,-DUseNonShared) + +#define MakeInObjectCodeDir() @@\ +MakefileObjectCodeDir($(ARCH)) @@\ +DependSubdirs($(ARCH)) @@\ +MakeSubdirs($(ARCH)) @@\ +InstallSubdirs($(ARCH)) @@\ +CleanSubdirs($(ARCH)) @@\ +SpecialTargets(debug,-DUseDebug) @@\ +SpecialTargets(noshared,-DUseNonShared) diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/config/InterViews/iv-alpha.cf iv-3.1-g++2.7.2/iv/src/config/InterViews/iv-alpha.cf --- iv-3.1/iv/src/config/InterViews/iv-alpha.cf Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/config/InterViews/iv-alpha.cf Tue Apr 2 22:41:13 1996 @@ -0,0 +1,58 @@ +/* + * Works with Digital Unix 3.2c and g++ 2.7.2 + * + * For use of Digital cxx, you might replace this file by + * iv-alpha-cxx.cf. You may have to work on it. + */ + +#include + +/* + * StandardDefines is: -DDEC -DR5_XLIB SMTDEFINES + * Unfortunately, SMTDEFINES expands to -DSMT which make Xlib.h include + * Xproto.h. + * Xproto.h overrides the definitions of Window, Cursor etc. made by + * Fresco. + */ +#undef StandardDefines +#define StandardDefines -DDEC -DR5_XLIB + +/* + * On OSF1, libX11 is compiled with decnet support. When we don't have + * decnet, we need a stub library to avoid undefined. + */ +#define ExtraCCLdLibs -ldnet_stub + +/* + * osf1.cf defines #define StandardIncludes -I$(CROSSBASE)/usr/include + * which expands here to -I/usr/include. Therefore, /usr/include is loaded + * prior to other defines. + * Remove it. + */ +#undef StandardIncludes + +/* + * ImakeCmd is supposed defined too. osf1.cf defines it as + * $(IMAKESRC)/imake.local + */ +#undef ImakeCmd +#define ImakeCmd imake + +/* + * Same for the InstallCmd + */ +#undef InstallCmd +#define InstallCmd /usr/bin/X11/install.sh + +#undef DefaultCCOptions + +#include + +#undef HasDynamicSharedLibraries +#define HasDynamicSharedLibraries YES +/* seems as if -fPIC isn't necessary on Alpha */ +#define SharedCCFlags /**/ +#define SharedCCLdFlags -shared \ @@\ + -Wl,-check_registry,/usr/shlib/so_locations \ @@\ + -Wl,-update_registry,/usr/local/lib/so_locations +#define SharedCCLdLibs $(CCLDLIBS) diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/config/InterViews/iv-linux.cf iv-3.1-g++2.7.2/iv/src/config/InterViews/iv-linux.cf --- iv-3.1/iv/src/config/InterViews/iv-linux.cf Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/config/InterViews/iv-linux.cf Tue Apr 2 21:42:41 1996 @@ -0,0 +1,26 @@ +#include +#include + +/* +** The standard distribution includes a copy of the TIFF library (libtiff) +** in libIV.a. As this duplicates libtiff and as you might get surprises +** if you install a new version of libtiff.a and nothing changes (due to +** ld ... -lIV -ltiff ...), I have removed libtiff.a from libIV.a. +** libtiff.a is available for Linux (as normal and shared library) as part +** of the libgr package. For those who want to include the TIFF library +** in libIV.so, they can do so by changing the HasLibTIFF to NO. +*/ +/* NOTE: This can't be redefined in local.def (used here already) */ +#undef HasLibTIFF +#define HasLibTIFF YES +#undef ExtraCCLdLibs +#define ExtraCCLdLibs -ltiff + + +#undef HasDynamicSharedLibraries +#define HasDynamicSharedLibraries YES +#define HasLinuxSharedLibraries YES +#define SharedCCFlags -fPIC +#define SharedCCLdFlags -shared +#define SharedCCLdLibs -lm + diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/config/InterViews/iv-sgi.cf iv-3.1-g++2.7.2/iv/src/config/InterViews/iv-sgi.cf --- iv-3.1/iv/src/config/InterViews/iv-sgi.cf Fri May 15 01:09:17 1992 +++ iv-3.1-g++2.7.2/iv/src/config/InterViews/iv-sgi.cf Tue Apr 2 13:52:27 1996 @@ -1,22 +1,42 @@ #include -#if OSMajorVersion >= 4 +#if OSMajorVersion < 4 -#define Ld_libX11 -lX11_s +#define ExtraCCFlags -float +#define ExtraCCLdLibs -lC -lsun -lmalloc -lc_s + +#endif + +#if OSMajorVersion == 4 /* force use of K&R cc to avoid cfront bugs */ #define ExtraCCFlags -float -cckr +#define ExtraCCLdLibs -lC -lsun -lmalloc -lc_s +#define Ld_libX11 -lX11_s + +#endif -#else +#if OSMajorVersion >= 5 +#define CCDriver CC +p #define ExtraCCFlags -float +#define ExtraCCLdLibs -lC -lsun -lmalloc -lc +#define Ld_libX11 -lX11 + +#undef HasDynamicSharedLibraries +#define HasDynamicSharedLibraries YES +#define SharedCCFlags /**/ +#define SharedCCLdFlags -shared +#define SharedCCLdLibs -lm #endif #define ExtraCCDefines -DSYSV -Dsigned= -Dvolatile= #define ExtraCCIncludes -#define ExtraCCLdLibs -lC -lsun -lmalloc -lc_s #define TIFFExtraCFlags /* can't trust DefaultCCOptions */ #define BuildGLContext YES + +#undef InstallCmd +#define InstallCmd bsdinst #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/config/InterViews/iv-stratus.cf iv-3.1-g++2.7.2/iv/src/config/InterViews/iv-stratus.cf --- iv-3.1/iv/src/config/InterViews/iv-stratus.cf Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/config/InterViews/iv-stratus.cf Tue Apr 2 13:52:28 1996 @@ -0,0 +1,15 @@ +#include + +/* So makedepend knows where to find c++ header files */ +#define DependCCFlags -DMAKEDEPEND $(CCDEFINES) $(CCINCLUDES) -I/usr/c++/include + +#define ExtraCCLdLibs -lsocket -lnsl + +/* Other architectures have these in TIFF.def, but this seems cleaner */ +#define TIFFStdCDefines \ + -DCOLORIMETRY_SUPPORT -DJPEG_SUPPORT -DYCBCR_SUPPORT -DCMYK_SUPPORT \ + -DHAVE_IEEEFP=1 -DUSE_VARARGS=0 -DUSE_PROTOTYPES=1 -DUSE_CONST=1 + +#define TIFFExtraCDefines -DSYSV + +#include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/config/InterViews/iv-sun.cf iv-3.1-g++2.7.2/iv/src/config/InterViews/iv-sun.cf --- iv-3.1/iv/src/config/InterViews/iv-sun.cf Wed Aug 21 18:07:36 1991 +++ iv-3.1-g++2.7.2/iv/src/config/InterViews/iv-sun.cf Tue Apr 2 13:52:28 1996 @@ -2,10 +2,17 @@ #include /* - * In case sun.cf defines HasSharedLibraries but not HasSunOSSharedLibraries. + * In case sun.cf defines HasSharedLibraries but not HasDynamicSharedLibraries. */ #if HasSharedLibraries -#define HasSunOSSharedLibraries YES +#define HasDynamicSharedLibraries YES +#endif + +#undef SharedCCLdFlags +#define SharedCCLdFlags -ztext -G + +#ifndef LnCmd +#define LnCmd ln -s #endif /* @@ -14,6 +21,6 @@ * have both debuggable and shareable libraries. */ #if defined(UseDebug) && defined(InObjectCodeDir) -#undef HasSunOSSharedLibraries -#define HasSunOSSharedLibraries NO +#undef HasDynamicSharedLibraries +#define HasDynamicSharedLibraries NO #endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/config/InterViews/local.def iv-3.1-g++2.7.2/iv/src/config/InterViews/local.def --- iv-3.1/iv/src/config/InterViews/local.def Tue Nov 24 21:08:51 1992 +++ iv-3.1-g++2.7.2/iv/src/config/InterViews/local.def Tue Apr 2 19:24:18 1996 @@ -1,14 +1,8 @@ /* - * For now, just assume cfront 2.0. - * If you are using cfront 2.1 or cfront 3.0, then use -Dcplusplus_2_1. + * If you are using cfront 2.0, then use -Dcplusplus_2_0. */ #undef LanguageCCDefines -#define LanguageCCDefines -Dcplusplus_2_0 - -/* - * If you are using gcc/g++, then uncomment the include below. - */ -/* #include */ +#define LanguageCCDefines -Dcplusplus_2_1 /* * Default customization of kits. @@ -26,13 +20,92 @@ #endif /* + * Build RPC classes on machines that support it. * If you are using g++, define BuildRPCClasses to NO. */ -#if defined(SGIArchitecture) || defined(SunArchitecture) +#if defined(SGIArchitecture) || defined(SunArchitecture) || \ +defined(StratusArchitecture) #undef BuildRPCClasses #define BuildRPCClasses YES #endif +#if defined(AlphaArchitecture) +#ifndef BuildRPCClasses +/*#define BuildRPCClasses YES*/ +#define BuildRPCClasses NO +#endif +/* + * If you are using DEC cxx, then uncomment the include below. + */ +/* +#include +*/ +#endif /* AlphaArchitecture */ + +/* + * If you are using gcc/g++, then uncomment the include below. + */ +#include + +/* + * Use this if your make program can understand include. + * gnumake does. OSF1 make does not. + */ + +#if defined(AlphaArchitecture) +#undef MakeCmd +#define MakeCmd gmake +#endif + +#ifndef DependTarget +#define DependTarget() @@\ +depend:: @@\ + $(RM) .dependencies @@\ + $(DEPEND) $(DEPEND_CCFLAGS) $(SRCS) > .dependencies @@\ + @@\ +.dependencies: @@\ + echo > .dependencies @@\ +include .dependencies +#endif + +#undef DependCmd +/* +#define DependCmd cxx -M +*/ +/* + * use this with g++: + */ +#define DependCmd g++ -M + +/* + * If you generally want optimization, uncomment the following line + * But be aware: on some architectures with some compilers some modules + * get broken if optimized! + * If you don't define it, modules get optimized nevertheless if it's + * wanted in the Imakefile (see e.g. src/lib/IV/Imakefile: InterViewsObjFlags) + */ +/* +#define TurnOnOptimizing YES +*/ + +/* + * Suffixe understood by AT&T CC, g++ and DEC cxx. + */ +#undef CCSuffix +#define CCSuffix c /* might want cc, cxx, C, etc. */ + +#ifndef StandardSuffix +#define StandardSuffix c +#endif + + STDSUFFIX = StandardSuffix + +#ifndef MakeChangeSuffix +#define MakeChangeSuffix() @@\ +ChangeSuffix: @@\ + @$(SHELL) $(SCRIPTSRC)/chgsuffix.sh $(STDSUFFIX) $(CCSUFFIX) +#endif + /* * Delete this definition if your /tmp space is less than five megabytes. */ @@ -49,7 +122,23 @@ * installed data files. */ #undef InstalledRoot -#define InstalledRoot /interviews +#define InstalledRoot /usr/local/interviews + +/* + * If we are going to define the above, then, we might as well have it + * take effect. (mrs) + */ +#undef InstallRelative +#define InstallRelative NO /* need absolute pathnames */ + +/* + * Install without .../$(ARCH)/... + */ +#define BinDir InstalledRoot/bin +#define LibDir InstalledRoot/lib +#define LibAllDir InstalledRoot/lib +#undef ManDir +#define ManDir InstalledRoot/man /* * If the X11 config files are not in /usr/lib/X11/config, the X11 @@ -60,11 +149,29 @@ * If you have to set XConfigDir, don't forget to override XCONFIGDIR * on the command line when saying "make World" for the first time. */ -/* -#undef XConfigDir -#define XConfigDir /usr/X11R5/lib/X11/config -#undef XIncDir -#define XIncDir /usr/X11R5/include -#undef XLibDir -#define XLibDir /usr/X11R5/lib -*/ +#if defined(AlphaArchitecture) +# undef XConfigDir +# define XConfigDir /usr/lib/X11/config +# undef XIncDir +# define XIncDir /usr/include/X11 +# undef XLibDir +# ifdef UseNonShared +# define XLibDir /usr/lib +# else +# define XLibDir /usr/shlib +# endif +#elif defined(LinuxArchitecture) +# undef XConfigDir +# define XConfigDir /usr/lib/X11/config +# undef XIncDir +# define XIncDir /usr/include/X11 +# undef XLibDir +# define XLibDir /usr/X11/lib +#else +# undef XConfigDir +# define XConfigDir /usr/lib/X11/config +# undef XIncDir +# define XIncDir /usr/include/X11 +# undef XLibDir +# define XLibDir /usr/lib/X11 +#endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/config/InterViews/params.def iv-3.1-g++2.7.2/iv/src/config/InterViews/params.def --- iv-3.1/iv/src/config/InterViews/params.def Sat Oct 31 00:43:49 1992 +++ iv-3.1-g++2.7.2/iv/src/config/InterViews/params.def Tue Apr 2 13:52:28 1996 @@ -50,18 +50,18 @@ #endif #endif -#ifndef HasSunOSSharedLibraries -#define HasSunOSSharedLibraries NO /* no shared libraries by default */ +#ifndef HasDynamicSharedLibraries +#define HasDynamicSharedLibraries NO /* no shared libraries */ #endif #if defined(UseNonShared) && defined(InObjectCodeDir) -#undef HasSunOSSharedLibraries -#define HasSunOSSharedLibraries NO /* don't use them anyway */ +#undef HasDynamicSharedLibraries +#define HasDynamicSharedLibraries NO /* don't use them anyway */ #endif #ifndef InstallRelative #define InstallRelative YES /* install in place */ #endif -#ifdef UseInstalled +#ifdef IVUseInstalled #undef InstallRelative #define InstallRelative NO /* need absolute pathnames */ #endif @@ -124,7 +124,7 @@ #endif #ifndef ImakeIncludes -#ifdef UseInstalled +#ifdef IVUseInstalled #define ImakeIncludes -I$(CONFIGDIR) -I$(XCONFIGDIR) #else #define ImakeIncludes -I$(CONFIGSRC) -I$(XCONFIGDIR) @@ -153,10 +153,10 @@ #endif #ifndef SpecialUseInstalled -#ifdef UseInstalled -#define SpecialUseInstalled -DUseInstalled +#ifdef IVUseInstalled +#define SpecialUseInstalled -DUseInstalled -DIVUseInstalled #else -#define SpecialUseInstalled /**/ +#define SpecialUseInstalled -DUseInstalled #endif #endif @@ -308,7 +308,7 @@ #endif #ifndef SharedCCFlags -#if HasSunOSSharedLibraries +#if HasDynamicSharedLibraries #define SharedCCFlags -PIC #else #define SharedCCFlags /**/ @@ -380,7 +380,7 @@ #endif #ifndef BackwardCompatibilityCCIncludes -#ifdef UseInstalled +#ifdef IVUseInstalled #define BackwardCompatibilityCCIncludes -I$(INCDIR)/IV-2_6 #else #define BackwardCompatibilityCCIncludes -I$(INCSRC)/IV-2_6 @@ -388,7 +388,7 @@ #endif #ifndef TopCCIncludes -#ifdef UseInstalled +#ifdef IVUseInstalled #define TopCCIncludes -I$(INCDIR) #else #define TopCCIncludes -I$(INCSRC) @@ -428,6 +428,14 @@ $(NONSHARED_CCLDFLAGS) #endif +/* + * Flags that are specific to the link line to build a shared library. + * These should be defined in the platform-specific config file. + */ +#ifndef SharedCCLdFlags +#define SharedCCLdFlags /**/ +#endif + #ifndef NonSharedCCLdFlags #if defined(UseNonShared) && defined(InObjectCodeDir) #define NonSharedCCLdFlags -Bstatic @@ -443,6 +451,7 @@ CCLDFLAGS = CCLdFlags IV_CCLDFLAGS = IvCCLdFlags NONSHARED_CCLDFLAGS = NonSharedCCLdFlags + SHARED_CCLDFLAGS = SharedCCLdFlags EXTRA_CCLDFLAGS = ExtraCCLdFlags /* @@ -463,7 +472,7 @@ #endif #ifndef DepPath -#if HasSunOSSharedLibraries || UseInstalled +#if HasDynamicSharedLibraries || IVUseInstalled #define DepPath(name) /* as nothing */ #else #define DepPath(name) Concat($(LIBSRC)/name/$(ARCH)/lib,name.a) @@ -518,7 +527,7 @@ #endif #ifndef LibDirPath -#ifdef UseInstalled +#ifdef IVUseInstalled #define LibDirPath -L$(LIBDIR) #else #define LibDirPath /* as nothing */ @@ -534,7 +543,7 @@ #endif #ifndef AbsLibDirPath -#if HasSunOSSharedLibraries && !defined(UseInstalled) +#if HasDynamicSharedLibraries && !defined(IVUseInstalled) #define AbsLibDirPath -L$(ABSLIBDIR) #else #define AbsLibDirPath /* as nothing */ @@ -542,7 +551,7 @@ #endif #ifndef LdPath -#ifdef UseInstalled +#ifdef IVUseInstalled #define LdPath(libname) Concat(-l,libname) #else #define LdPath(libname) -L$(LIBSRC)/libname/$(ARCH) Concat(-l,libname) @@ -572,8 +581,17 @@ #define ExtraCCLdLibs /**/ #endif +/* + * Libraries that should be linked into another shared library. + * These should be defined in the platform-specific config file. + */ +#ifndef SharedCCLdLibs +#define SharedCCLdLibs /**/ +#endif + CCLDLIBS = CCLdLibs IV_CCLDLIBS = IvCCLdLibs + SHARED_CCLDLIBS = SharedCCLdLibs EXTRA_CCLDLIBS = ExtraCCLdLibs /* @@ -581,7 +599,7 @@ */ #ifndef InstallCmd #if SystemV || SystemV4 -#ifdef UseInstalled +#ifdef IVUseInstalled #define InstallCmd bsdinst #else #define InstallCmd $(SHELL) $(SCRIPTSRC)/bsdinst.sh @@ -670,7 +688,7 @@ #endif #ifndef MkdirhierCmd -#ifdef UseInstalled +#ifdef IVUseInstalled #define MkdirhierCmd mkdirhier #else #define MkdirhierCmd $(SHELL) $(SCRIPTSRC)/mkdirhier.sh @@ -731,7 +749,7 @@ TOP = TOPDIR CURRENT_DIR = CURDIR -#ifndef UseInstalled +#ifndef IVUseInstalled IVSRC = $(TOP)/src BINSRC = $(IVSRC)/bin CONFIGSRC = $(IVSRC)/config diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/config/InterViews/rules.def iv-3.1-g++2.7.2/iv/src/config/InterViews/rules.def --- iv-3.1/iv/src/config/InterViews/rules.def Fri Sep 25 00:06:33 1992 +++ iv-3.1-g++2.7.2/iv/src/config/InterViews/rules.def Tue Apr 2 13:52:28 1996 @@ -50,7 +50,7 @@ #endif #ifndef MakeWorld -#if HasSunOSSharedLibraries +#if HasDynamicSharedLibraries #define MakeWorld(flags) @@\ MakeNormalWorld(flags) @@\ MakeSpecialWorld(.debug,flags) @@\ @@ -199,7 +199,7 @@ * Shorthand for making all targets in a list of subdirectories. */ #ifndef MakeInSubdirs -#if HasSunOSSharedLibraries +#if HasDynamicSharedLibraries #define MakeInSubdirs(dirs) @@\ MakefilesSubdirs(dirs) @@\ DependSubdirs(dirs) @@\ @@ -224,7 +224,7 @@ * subdirectory. */ #ifndef MakeInObjectCodeDir -#if HasSunOSSharedLibraries +#if HasDynamicSharedLibraries #define MakeInObjectCodeDir() @@\ MakefileObjectCodeDir($(ARCH)) @@\ DependSubdirs($(ARCH)) @@\ @@ -399,9 +399,9 @@ /* * Make a shared library. */ -#ifndef NormalSunOSSharedLibraryTarget -#if OSMajorVersion < 5 -#define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\ +#ifndef NormalDynamicSharedLibraryTarget +#if defined(sun) && OSMajorVersion < 5 +#define NormalDynamicSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\ AOUT = Concat(lib,libname.so.rev) @@\ SHARED_CCFLAGS = SharedCCFlags @@\ @@\ @@ -417,7 +417,7 @@ clean:: @@\ $(RM) Concat(lib,libname.so.rev) #else -#define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\ +#define NormalDynamicSharedLibraryTarget(libname,rev,depobjs,ldobjs) @@\ AOUT = Concat(lib,libname.so.rev) @@\ SHARED_CCFLAGS = SharedCCFlags @@\ @@\ @@ -425,12 +425,10 @@ @@\ Concat(lib,libname.so.rev): depobjs @@\ @echo "building $@" @@\ - $(RM) $@~ @@\ - $(LD) -o $@~ -ztext -G ldobjs @@\ $(RM) $@ @@\ - $(MV) $@~ $@ @@\ + $(LD) -o $@ $(SHARED_CCLDFLAGS) ldobjs $(SHARED_CCLDLIBS) @@\ $(RM) Concat(lib,libname.so) @@\ - $(LN) -s $@ Concat(lib,libname.so) @@\ + $(LN) $@ Concat(lib,libname.so) @@\ @@\ clean:: @@\ $(RM) Concat(lib,libname.so.rev) @@ -457,9 +455,9 @@ * Make either a shared library or a non-shared library. */ #ifndef NormalLibraryTarget -#if HasSunOSSharedLibraries +#if HasDynamicSharedLibraries #define NormalLibraryTarget(libname,rev,depobjs,ldobjs) @@\ -NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs) +NormalDynamicSharedLibraryTarget(libname,rev,depobjs,ldobjs) #else #define NormalLibraryTarget(libname,rev,depobjs,ldobjs) @@\ NormalNonSharedLibraryTarget(libname,depobjs,ldobjs) @@ -545,7 +543,7 @@ */ #ifndef CppSedMagic #define CppSedMagic sed -e '/^# *[0-9][0-9]* *.*$$/d' \ - -e '/^XCOMM$$/s//#/' \ + -e '/^XCOMM$$/s/^XCOMM/#/' \ -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/' #endif /* CppSedMagic */ @@ -590,8 +588,8 @@ /* * Install a library. */ -#ifndef InstallSunOSSharedLibrary -#define InstallSunOSSharedLibrary(libname,rev,dest) @@\ +#ifndef InstallDynamicSharedLibrary +#define InstallDynamicSharedLibrary(libname,rev,dest) @@\ install:: Concat(lib,libname.so.rev) @@\ MakeDir(dest) @@\ $(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest @@ -606,9 +604,9 @@ #endif #ifndef InstallLibrary -#if HasSunOSSharedLibraries +#if HasDynamicSharedLibraries #define InstallLibrary(libname,rev,dest) @@\ -InstallSunOSSharedLibrary(libname,rev,dest) +InstallDynamicSharedLibrary(libname,rev,dest) #else #define InstallLibrary(libname,rev,dest) @@\ InstallNonSharedLibrary(libname,dest) diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/colors/Imakefile iv-3.1-g++2.7.2/iv/src/examples/colors/Imakefile --- iv-3.1/iv/src/examples/colors/Imakefile Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/colors/Imakefile Tue Apr 2 13:52:28 1996 @@ -0,0 +1,13 @@ +#ifdef InObjectCodeDir + +Use_libInterViews() +ComplexProgramTarget(test) + +MakeObjectFromSrc(colorChooser) +MakeObjectFromSrc(rgbNames) + +#else + +MakeInObjectCodeDir() + +#endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/colors/colorChooser.c iv-3.1-g++2.7.2/iv/src/examples/colors/colorChooser.c --- iv-3.1/iv/src/examples/colors/colorChooser.c Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/colors/colorChooser.c Tue Apr 2 13:52:28 1996 @@ -0,0 +1,640 @@ +/* colorChooser.c: + * a simple interviews application for searching through the red-green-blue + * color space of your workstation or terminal, and learning the name of + * any color that can be displayed on it. if you invoke this program with + * exactly one argument, the name of a file like the standard X + * distribution's "rgb.txt", the program will sometimes be able to tell + * you an English language name for the current color. If the current color + * is not sufficiently near to any of these named colors, the program will + * give you a 6-digit hexadecimal string to name the color. In either case, + * the name can be used to specify X resource colors. + * + * some sample invocations: + * colorChooser + * colorChooser /usr/lib/X11/rgb.txt + * colorChooser /local/X11R5/lib/X11/rgb.txt + * colorChooser $OPENWINHOME/lib/rgb.txt + * + * (the last three try to cover the range of places where the rgb.txt + * might be found on your workstation) + * + * here's what the rgb.txt file actually looks like: + * + * 255 250 240 FloralWhite + * 253 245 230 OldLace + * 250 240 230 linen + * 250 235 215 AntiqueWhite + * 255 239 213 PapayaWhip + * + * + * This program is based upon "cedit" by Dave Sternlicht of the MIT + * X Consortium. Many thanks to Dave, for cedit and for his frequent, + * helpful postings to comp.windows.interviews. + * + * This program was developed using InterViews 3.1beta3. + * + * I wrote this program as a learning exercise. I've met with a lot of + * frustration in learning InterViews. There are no books, and + * sample source code is invariably cryptic. I hope that this program + * reads easily; if any one has questions, suggestions or complaints, + * please send them to me, pshannon@nrao.edu, and I'll do my best to help. + * + * + * thumbnail sketch + * + * This program demonstrates the interaction between 3 fundamental + * iv classes: Adjustable, Adjuster, and Observer. See Chapter 4 of + * the InterViews manual for a description of these classes. I believe + * that these three classes are analagous to Smalltalk's Model-View- + * Controller: Adjustables (Models) are the data your program is + * concerned with; Adjusters (Controllers) manipulate the data; + * Observers (Views) provide ways to view the data. In this program, + * instances of these three classes are used like this: + * + * Adjusters: 3 vertical scrollbars, one each for the red, green, and + * blue color components. + * Adjustables: 3 "ColorValue" objects, each of which stores the color + * intensity of the color component it represents. + * Observers: - 1 color patch, which watches the ColorValue objects, + * and displays the color described by them + * - 3 "ColorValueReadout" objects, each of which + * watches one of the ColorValues, and displays the intensity + * of its ColorValue as a number between 0 and 255, in a + * little box just above the related scrollbar + * - 1 "DynamicLabel", which watches the ColorValue objects + * and displays a name for the current color in an inset + * box above the color patch. + * + * + * a little more detail + * + * - the 3 "ColorValue" adjustables, one for each of the color + * components, form the heart of the program. they accept + * scrolling messages from the scrollbars. they (implicitly) send + * update messages to all of their attached observers when their + * notify function is called. they don't appear on the screen, but they + * store the current intensitity of the colors, and the rate at which they + * change these values in response to messages from adjusters (the + * scrollbars). + * class ColorValue: public Adjustable + * + * - 3 scrollbars, which subclass Adjuster, and send messages to the + * ColorValue adjustables. they are produced by WidgetKit member + * functions, and are initialized with a single parameter each -- + * a pointer to the adjustable they'll adjust. + * + * - each of the observers is attached to the ColorValue adjustables, so + * that they can be notified whenever the adjustables have changed. + * they then query the ColorValue objects to find out what their current + * values are, and update themselves appropriately: + * + * 1. class ColorDisplay: public Patch, public Observer + * 2. class DynamicLabel: public MonoGlyph, public Observer + * 3. class ColorValueReadout: public MonoGlyph, public Observer + * + * note: the ColorDisplay object and the DynamicLabel object are both + * attached to all three of the ColorValue objects: they both need + * the value of all three color components in order to update themselves. + * but the ColorValueReadout objects are each attached to only + * one of the ColorValue objects -- the one which corresponds to the + * color component they're concerned with. + * + * there's one more class in this application, which simply returns + * a color name when it's passed a triplet of red-green-blue values. + * it's declared in rgbNames.h, and defined in rgbNames.c. + * + * class RGBNames { + * public: + * RGBNames (); + * RGBNames (const char *filename); + * char *lookupName (int red, int green, int blue); + * }; + */ +/*----------------------------------------------------------------------------*/ +static char *SCCSid = "@(#)colorChooser.c 2.2 12/16/92 12:03:28"; +/*----------------------------------------------------------------------------*/ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "rgbNames.h" +/*----------------------------------------------------------------------------*/ +/* ColorValue is a subclass of Adjustable. Adjustables are broadly defined + * as objects that "handle requests to modify their viewing area." + * objects of the ColorValue class, however, are not seen on the screen. + * each object of this class + * - records the current intensity of one of the three primary colors + * (the application has three ColorValue objects, one each for + * red, green and blue); + * - sets the bounds that the color intensity must stay within + * - is connnected to a scrollbar (an adjuster subclass), from which + * it receives a variety of scrolling messages + * - has observers attached that can be told (via Adjustable::notify) + * that it has changed. + * the values range from 0.0 to 1.0, which is the InterViews color range, + * perhaps inherited from PostScript. I'm more used to thinking of color + * on workstation screens ranging from 0-255, so you'll see below that + * ColorValueReadout objects scale the numbers into that range. + */ +/*----------------------------------------------------------------------------*/ +class ColorValue: public Adjustable { +protected: + ColorValue (); +public: + ColorValue (Coord lower, Coord upper); + virtual ~ColorValue (); + + virtual void lower_bound (Coord); + virtual void upper_bound (Coord); + virtual void current_value (Coord); + virtual void scroll_incr (Coord); + virtual void page_incr (Coord); + + virtual Coord lower (DimensionName) const; + virtual Coord upper (DimensionName) const; + virtual Coord length (DimensionName) const; + virtual Coord cur_lower (DimensionName) const; + virtual Coord cur_upper (DimensionName) const; + virtual Coord cur_length (DimensionName) const; + + virtual void scroll_to (DimensionName, Coord position); + virtual void scroll_forward (DimensionName); + virtual void scroll_backward (DimensionName); + virtual void page_forward (DimensionName); + virtual void page_backward (DimensionName); +private: + Coord curvalue_; + Coord lower_; + Coord span_; + Coord scroll_incr_; + Coord page_incr_; +}; +/*----------------------------------------------------------------------------*/ +ColorValue::ColorValue () +{ + scroll_incr_ = 0.0; + page_incr_ = 0.0; +} +/*----------------------------------------------------------------------------*/ +ColorValue::ColorValue (Coord lower, Coord upper) +{ + lower_ = lower; + span_ = upper - lower; + scroll_incr_ = span_ * 0.005; + page_incr_ = span_ * 0.1; + curvalue_ = (lower + upper) * 0.5; +} +/*----------------------------------------------------------------------------*/ +ColorValue::~ColorValue () {} +void ColorValue::lower_bound (Coord c) {lower_ = c;} +void ColorValue::upper_bound (Coord c) {span_ = c - lower_;} +/*----------------------------------------------------------------------------*/ +void ColorValue::current_value (Coord value) +{ + curvalue_ = value; + constrain (Dimension_X, curvalue_); + notify (Dimension_X); + notify (Dimension_Y); +} +/*----------------------------------------------------------------------------*/ +void ColorValue::scroll_incr (Coord c) {scroll_incr_ = c;} +void ColorValue::page_incr (Coord c) {page_incr_ = c;} +Coord ColorValue::lower (DimensionName) const {return lower_;} +Coord ColorValue::upper (DimensionName) const {return lower_ + span_;} +Coord ColorValue::length (DimensionName) const {return span_;} +Coord ColorValue::cur_lower (DimensionName) const {return curvalue_;} +Coord ColorValue::cur_upper (DimensionName) const {return curvalue_;} +Coord ColorValue::cur_length (DimensionName) const {return 0;} +/*----------------------------------------------------------------------------*/ +void ColorValue::scroll_to (DimensionName d, Coord position) +{ + Coord p = position; + constrain (d, p); + if (p != curvalue_) { + curvalue_ = p; + notify (Dimension_X); + notify (Dimension_Y); + } +} +/*----------------------------------------------------------------------------*/ +void ColorValue::scroll_forward (DimensionName d) +{ + scroll_to (d, curvalue_ + scroll_incr_); +} +/*----------------------------------------------------------------------------*/ +void ColorValue::scroll_backward (DimensionName d) +{ + scroll_to(d, curvalue_ - scroll_incr_); +} +/*----------------------------------------------------------------------------*/ +void ColorValue::page_forward(DimensionName d) +{ + scroll_to(d, curvalue_ + page_incr_); +} +/*----------------------------------------------------------------------------*/ +void ColorValue::page_backward(DimensionName d) +{ + scroll_to(d, curvalue_ - page_incr_); +} +/*============================================================================*/ +/* ColorValueReadout subclasses Observer, so that these objects + * can be attached to Adjustables (in our case, to ColorValues) and will + * receive the update message from ColorValue::notify. the + * attachment takes place in the ColorValueReadout constructor. when + * the update message is received, the ColorValueReadout asks its + * associated ColorValue for its current value, and then sprintf's that number + * into a string, and passes it to its FieldEditor. + */ + +class ColorValueReadout: public MonoGlyph, public Observer { +public: + ColorValueReadout (ColorValue*, Style*); + virtual ~ColorValueReadout (); + virtual InputHandler* focusable () const; + virtual void update (Observable*); + virtual void disconnect (Observable*); +private: + ColorValue* colorValue_; + FieldEditor* editor_; + void accept_editor (FieldEditor*); + void cancel_editor (FieldEditor*); +}; +/*----------------------------------------------------------------------------*/ +/* These macros allow the user's typed numbers, in the text editor fields, to + * be passed back to theColorValueReadout. + */ + +declareFieldEditorCallback(ColorValueReadout) +implementFieldEditorCallback(ColorValueReadout) +/*----------------------------------------------------------------------------*/ +ColorValueReadout::ColorValueReadout + (ColorValue* colorValue, Style* style): MonoGlyph (nil) +{ + Style* s = new Style (style); + s->alias ("ColorValueReadout"); + colorValue_ = colorValue; + colorValue->attach (Dimension_X, this); + editor_ = DialogKit::instance()->field_editor ( + "100.00", s, + new FieldEditorCallback(ColorValueReadout)( + this, &ColorValueReadout::accept_editor, + &ColorValueReadout::cancel_editor + ) + ); + body (editor_); + update (colorValue->observable (Dimension_X)); +} +/*----------------------------------------------------------------------------*/ +ColorValueReadout::~ColorValueReadout () +{ + if (colorValue_ != nil) + colorValue_->detach(Dimension_X, this); +} +/*----------------------------------------------------------------------------*/ +InputHandler* ColorValueReadout::focusable () const +{ + return editor_; +} +/*----------------------------------------------------------------------------*/ +void ColorValueReadout::update (Observable*) +{ + int scaledColorValue = (int) (255 * colorValue_->cur_lower (Dimension_X)); + char buf [20]; + sprintf (buf, "%2d", scaledColorValue); + editor_->field (buf); +} +/*----------------------------------------------------------------------------*/ +void ColorValueReadout::disconnect (Observable*) +{ + colorValue_ = nil; +} +/*----------------------------------------------------------------------------*/ +void ColorValueReadout::accept_editor (FieldEditor*) +{ + Coord v; + const String& value = *editor_->text(); + if (value.convert (v)) + colorValue_->current_value (v); +} +/*----------------------------------------------------------------------------*/ +void ColorValueReadout::cancel_editor(FieldEditor*) +{ + update (colorValue_->observable (Dimension_X)); +} +/*============================================================================*/ +/* ColorDisplay. this class is attached to ColorValue objects, from + * which they receive update objects whenever the ColorValues change. + * they find out the current rgb values + */ +class ColorDisplay: public Patch, public Observer { +public: + ColorDisplay (ColorValue*, ColorValue*, ColorValue*, Style*); + virtual ~ColorDisplay (); + + virtual void allocate (Canvas*, const Allocation&, Extension&); + virtual void draw (Canvas*, const Allocation&) const; + virtual void update (Observable*); + virtual void disconnect (ColorValue*); +private: + Adjustable* red_; + Adjustable* green_; + Adjustable* blue_; + Color* color_; +}; +/*----------------------------------------------------------------------------*/ +ColorDisplay::ColorDisplay (ColorValue* r, ColorValue* g, + ColorValue* b, Style*) : Patch (nil) +{ + red_ = r; + red_->attach (Dimension_X, this); + green_ = g; + green_->attach (Dimension_X, this); + blue_ = b; + blue_->attach (Dimension_X, this); + color_ = nil; +} +/*----------------------------------------------------------------------------*/ +ColorDisplay::~ColorDisplay() +{ + if (red_ != nil) + red_->detach(Dimension_X, this); + + if (green_ != nil) + green_->detach(Dimension_X, this); + + if (blue_ != nil) + blue_->detach(Dimension_X, this); +} +/*----------------------------------------------------------------------------*/ +void ColorDisplay::allocate (Canvas* canvas, const + Allocation& allocation, + Extension& extension) +{ + extension.set (canvas, allocation); + Patch::allocate (canvas, allocation, extension); +} +/*----------------------------------------------------------------------------*/ +void ColorDisplay::draw (Canvas* canvas, + const Allocation& allocation) const +{ + canvas->fill_rect (allocation.left (), allocation.bottom (), + allocation.right (), allocation.top (), color_); +} +/*----------------------------------------------------------------------------*/ +void ColorDisplay::update (Observable*) +{ + Resource::unref (color_); + color_ = new Color ( + float (red_->cur_lower(Dimension_X)), + float (green_->cur_lower(Dimension_X)), + float (blue_->cur_lower(Dimension_X)),1.0); + + Resource::ref (color_); + redraw (); +} +/*----------------------------------------------------------------------------*/ +void ColorDisplay::disconnect (ColorValue* a) +{ + if (a == red_) + red_ = nil; + else if (a == green_) + green_ = nil; + else if (a == blue_) + blue_ = nil; +} +/*============================================================================*/ +/* DynamicLabel watches all three of the ColorValues, asks the RGBNames + * class for a new string whenever any of the ColorValues change, and + * then writes that new string to its patch. + */ +class DynamicLabel: public MonoGlyph, public Observer { +public: + DynamicLabel::DynamicLabel (RGBNames*, ColorValue*, ColorValue*, + ColorValue*, Style*); + virtual void update (); + virtual void update (Observable*); +private: + Patch* patch_; + Style* style_; + char text_ [80]; + WidgetKit *kit; + RGBNames *rgbLookupTable_; + Adjustable* red_; + Adjustable* green_; + Adjustable* blue_; +}; +/*----------------------------------------------------------------------------*/ +DynamicLabel::DynamicLabel (RGBNames *lookupTable, + ColorValue *redValue, ColorValue *greenValue, + ColorValue *blueValue, Style* style): + MonoGlyph (nil) +{ + style_ = style; + kit = WidgetKit::instance (); + patch_ = new Patch (nil); + body (patch_); + strcpy (text_, "no text yet"); + red_ = redValue; + green_ = greenValue; + blue_ = blueValue; + rgbLookupTable_ = lookupTable; + + red_->attach (Dimension_X, this); + green_->attach (Dimension_X, this); + blue_->attach (Dimension_X, this); + update (); +} +/*----------------------------------------------------------------------------*/ +void DynamicLabel::update () +{ + int scaledRed, scaledGreen, scaledBlue; + + scaledRed = (int) (255 * red_->cur_lower (Dimension_X)); + scaledGreen = (int) (255 * green_->cur_lower (Dimension_X)); + scaledBlue = (int) (255 * blue_->cur_lower (Dimension_X)); + sprintf (text_, "%s", + rgbLookupTable_->lookupName (scaledRed, scaledGreen, scaledBlue)); + + patch_->body (new Label (text_, kit->font (), kit->foreground ())); + patch_->redraw (); + patch_->reallocate (); + patch_->redraw (); + +} +/*----------------------------------------------------------------------------*/ +void DynamicLabel::update (Observable *) +{ + int scaledRed, scaledGreen, scaledBlue; + + scaledRed = (int) (255 * red_->cur_lower (Dimension_X)); + scaledGreen = (int) (255 * green_->cur_lower (Dimension_X)); + scaledBlue = (int) (255 * blue_->cur_lower (Dimension_X)); + sprintf (text_, "%s", + rgbLookupTable_->lookupName (scaledRed, scaledGreen, scaledBlue)); + + patch_->body (new Label (text_, kit->font (), kit->foreground ())); + patch_->redraw (); + patch_->reallocate (); + patch_->redraw (); + +} +/*============================================================================*/ +int main (int argc, char** argv) +{ + Session* session = new Session ("ColorChooser", argc, argv); + Style* style = session->style(); + WidgetKit& kit = *WidgetKit::instance(); + LayoutKit& layout = *LayoutKit::instance(); + ColorValue* redValue = new ColorValue (0.0, 1.0); + ColorValue* greenValue = new ColorValue (0.0, 1.0); + ColorValue* blueValue = new ColorValue (0.0, 1.0); + RGBNames *rgbLookupTable; + Glyph *colorVBox, *scrollersAndReadoutVBox, *mainHBox; + ColorValueReadout *redReadOut, *greenReadOut, *blueReadOut; + + /* construct the rgb name table, possibly using a path to a rgb.txt + */ + if (argc == 2) + rgbLookupTable = new RGBNames (argv [1]); + else + rgbLookupTable = new RGBNames (); + + DynamicLabel* colorNameDisplay = + new DynamicLabel (rgbLookupTable, redValue, greenValue, blueValue, style); + Glyph *framedColorNameDisplay; + + /* InterViews requires us to use styles in order to set X resources + * for glyphs. the user interface has three scrollbars, side-by-side, + * each topped off by a numerical readout. we want the each of the + * three color readouts to use the appropriate foreground color, + * reminding the user which color the scrollbar manimpulates. + * these three styles allow us to set the color of the text in the + * readouts as X resources: + * ColorChooser*redReadOut*foreground: red + * ColorChooser*greenReadOut*foreground: green3 + * ColorChooser*blueReadOut*foreground: blue + */ + kit.begin_style ("redReadOut"); + redReadOut = new ColorValueReadout (redValue, style); + kit.end_style (); + + kit.begin_style ("greenReadOut"); + greenReadOut = new ColorValueReadout (greenValue, style); + kit.end_style (); + + kit.begin_style ("blueReadOut"); + blueReadOut = new ColorValueReadout (blueValue, style); + kit.end_style (); + + /* create a bunch of layout glyphs, containing the user interface + * objects, which are later assembled into the ApplicationWindow. + * framedColorNameDisplay: this is an inset frame in which the + * name of the current color is displayed + * colorVBox: an unframed vertical box which contains the + * framedColorNameDisplay, centered above an inset frame holding + * the color patch. + * scrollersAndReadoutVBox: another vertical box, which has the + * three scrollbars topped off by the numerical readout boxes. + * mainHBox: a horizontal box which assembles the colorVBox + * and the scrollersAndReadoutVbox side-by-side + */ + + + + framedColorNameDisplay = + kit.inset_frame ( + layout.hbox ( + layout.hglue (3,0,0), + layout.h_fixed_span ( + colorNameDisplay, + 155) + ) + ); + + colorVBox = + layout.vbox ( + layout.vglue (30,0,0), + layout.hbox ( + layout.hglue (20,0,0), + framedColorNameDisplay + ), + layout.vglue (10,0,0), + kit.inset_frame ( + layout.fixed_span ( + new ColorDisplay (redValue, greenValue, blueValue, style), + 200.0, 200.0) + ) + ); + + scrollersAndReadoutVBox = + layout.vbox ( + layout.vglue (63,0,0), + layout.hbox ( + layout.h_fixed_span (redReadOut, 25), + layout.h_fixed_span (greenReadOut, 25), + layout.h_fixed_span (blueReadOut, 25)), + layout.v_fixed_span ( + layout.hbox ( + layout.h_fixed_span (kit.vscroll_bar (redValue), 25), + layout.h_fixed_span (kit.vscroll_bar (greenValue), 25), + layout.h_fixed_span (kit.vscroll_bar (blueValue), 25) + ), + 185.0), + layout.vglue (13,0,0) + ); + + mainHBox = + layout.hbox ( + layout.margin ( + colorVBox, + 8.0), + layout.margin ( + scrollersAndReadoutVBox, + 8.0) + ); + + Window* w = new ApplicationWindow ( + new Background ( + kit.outset_frame ( + layout.hbox ( + layout.hglue (), + layout.vbox ( + layout.vglue (), + layout.margin (kit.push_button ("Quit", kit.quit()), 5.0), + mainHBox, + layout.vglue() + ), + layout.hglue () + ) + ), + kit.background () + ) // Background + ); // ApplicationWindow + + redValue->current_value (0.7); + greenValue->current_value (0.6); + blueValue->current_value (0.8); + colorNameDisplay->update (); + + return session->run_window (w); + +} // main +/*----------------------------------------------------------------------------*/ diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/colors/original-makefile iv-3.1-g++2.7.2/iv/src/examples/colors/original-makefile --- iv-3.1/iv/src/examples/colors/original-makefile Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/colors/original-makefile Tue Apr 2 13:52:29 1996 @@ -0,0 +1,21 @@ +LIB = /local/iv/installed/lib/SUN4/libIV.so.3.1 -lXext -lX11 +INCDIR = -I/local/iv/installed/include +CC=/usr/lang/CC +default: colorChooser runProgram + +runProgram: + colorChooser /local/X11R5/lib/X11/rgb.txt -geometry +600+200 & +# colorChooser /usr/lib/X11/rgb.txt +# colorChooser /local/X11R5/lib/X11/rgb.txt +# colorChooser $OPENWINHOME/lib/rgb.txt + +colorChooser: colorChooser.o rgbNames.o + $(CC) colorChooser.o rgbNames.o $(LIB) -o colorChooser + +colorChooser.o: colorChooser.c + $(CC) -c $(INCDIR) colorChooser.c + +rgbNames.o: rgbNames.c + $(CC) -c $(INCDIR) rgbNames.c + + diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/colors/rgbNames.c iv-3.1-g++2.7.2/iv/src/examples/colors/rgbNames.c --- iv-3.1/iv/src/examples/colors/rgbNames.c Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/colors/rgbNames.c Tue Apr 2 13:52:29 1996 @@ -0,0 +1,214 @@ +/* rgbNames.c: a class that reads and stores the X11 color names + * color names, stored in $OPENWINHOME/lib/rgb.txt, and which will return + * a color name which is a reasonable match for an rgb triplet. for example + * + * 186 85 211 will return MediumOrchid + * + * the numbers are from a scale that runs from 0 to 255. + * + * the RGBNames class is defined in this file, and may be tested here + * as well, by defining EMBEDDED_TEST at compile time. the class + * is designed to be part of a simple Interviews exercise, in which + * the user may interactively choose colors for display. this class + * allows the program to convert the rgb numerical triplet into a name + * meaningful to the xnews server. + * + * the header file, rgbNames.h, declares the public portion of this class, + * and should be included by any application that wants to use the class. + */ +/*----------------------------------------------------------------------------*/ +#include +#include +#include +#include +/*----------------------------------------------------------------------------*/ +int extractRGBValuesAndColorName (char *rawString, + int *red, int *green, int *blue, + char *colorName); +/*----------------------------------------------------------------------------*/ +const char *const RGB_FILE = "/usr/openwin/lib/rgb.txt"; +const int MAX_COLORS = 800; +const int BIG_STRING_SIZE = 255; + +class RGBNames { +public: + RGBNames (); + RGBNames (const char *filename); + char *lookupName (int red, int green, int blue); +private: + struct rgbNameTableType { + int red, green, blue; + char name [40]; + }; + rgbNameTableType rgbNameTable [MAX_COLORS]; + int rgbtxtFileIsBeingUsed; + int tableSize; + int tolerance; /* in matching an incoming rgb against a table entry */ + void init (const char *filename); +}; +/*----------------------------------------------------------------------------*/ +void RGBNames::init (const char *filename) +{ + FILE *fp; + char rawString [BIG_STRING_SIZE]; + int red, green, blue; + char colorName [40]; + int badLines = 0; + int totalLines = 0; + + if ((fp = fopen (filename, "r")) == (FILE *) NULL) { + rgbtxtFileIsBeingUsed = 0; + return; + } /* fopen failed */ + + /* we found the file, so read it into the table. + * todo: check the file for integrity + */ + + rgbtxtFileIsBeingUsed = 1; + + tableSize = 0; + while (fgets (rawString, BIG_STRING_SIZE - 1, fp) != (char *) NULL) { + totalLines++; + rawString [strlen (rawString) - 1] = 0; /* strip linefeed */ + if (extractRGBValuesAndColorName (rawString, &red, &green, &blue, + colorName)) { + rgbNameTable [tableSize].red = red; + rgbNameTable [tableSize].green = green; + rgbNameTable [tableSize].blue = blue; + strcpy (rgbNameTable [tableSize].name, colorName); + tableSize++; + } /* if good extraction -- no spaces in the color name */ + else + badLines++; + } /* while not eof */ + + tolerance = 10; + + fclose (fp); + +} /* RGBNames::init */ +/*----------------------------------------------------------------------------*/ +RGBNames::RGBNames () +{ + rgbtxtFileIsBeingUsed = 0; + +} /* RGBNames constructor */ +/*----------------------------------------------------------------------------*/ +RGBNames::RGBNames (const char *filename) +{ + init (filename); + +} /* RGBNames constructor */ +/*----------------------------------------------------------------------------*/ +char *RGBNames::lookupName (int red, int green, int blue) +/* return the name of the color with rgb values closest to those supplied + * in the parameter list. "closest" is the table entry with the smallest + * error: abs (redRequested - redInTable [i]) + + * abs (greenRequested - greenInTable [i]) + + * abs (blueRequested - blueInTable [i]) + + * this definition, and its implementation are hasty, brute force + * techniques. lots of improvement is possible... + */ +{ + int exactlyMatchingEntry, exactMatch = 0; + int redError, greenError, blueError; + char hexColorName [20]; + char temp [20]; + + if (rgbtxtFileIsBeingUsed) { + for (int i=0; i < tableSize; i++) { + redError = abs (red - rgbNameTable [i].red); + greenError = abs (green - rgbNameTable [i].green); + blueError = abs (blue - rgbNameTable [i].blue); + if (redError + greenError + blueError < tolerance) { + exactMatch = 1; + exactlyMatchingEntry = i; + break; + } /* if exact match */ + } /* for i */ + if (exactMatch) + return rgbNameTable [exactlyMatchingEntry].name; + } /* if rgbtxtFileIsBeingUsed */ + + /* either there's no rgb.txt file in use, or no exact match was found. + * so cobble together the hex value of the current rgb triplet: + */ + + sprintf (temp, "%02x%02x%02x", red, green, blue); + strcpy (hexColorName, "#"); + strcat (hexColorName, temp); + return hexColorName; + +} /* RGBNames:: lookupName */ +/*----------------------------------------------------------------------------*/ +int extractRGBValuesAndColorName (char *rawString, + int *red, int *green, int *blue, + char *colorName) +/* X11 stores colors like this: + * 186 85 211 medium orchid + * 186 85 211 MediumOrchid + * here, we're only interested in the second form, in which the color + * name is one continous word, with now embedded blanks. extract the tokens + * from , and figure out if there are blanks in the color name (by + * trying to extract a 5th token). return the values via the function + * arguments, and return the function's value + * 1: color name is only one word + * 0: more than one word + */ + +{ + static char *separators = " \t"; /* space and tab */ + char *newToken; + int colorNameIsOnlyOneWord; + static int timesCalled = 0; + + newToken = strtok (rawString, separators); + assert (newToken); + *red = atoi (newToken); + + newToken = strtok ((char *) NULL, separators); + assert (newToken); + *green = atoi (newToken); + + newToken = strtok ((char *) NULL, separators); + assert (newToken); + *blue = atoi (newToken); + + newToken = strtok ((char *) NULL, separators); + assert (newToken); + strcpy (colorName, newToken); + + if (strtok ((char *) NULL, separators)) + colorNameIsOnlyOneWord = 0; + else + colorNameIsOnlyOneWord = 1; + + return colorNameIsOnlyOneWord; + +} /* extract rgb values and color names */ +/*----------------------------------------------------------------------------*/ +#ifdef EMBEDDED_TEST +/*------------------*/ +int main (int, char **) +{ + int red, green, blue; + char colorName [80]; + + RGBNames rgbLookupTable ("/usr/openwin/lib/rgb.txt"); + + while (1) { + printf ("enter rgb value (red green blue)\n"); + scanf ("%d %d %d", &red, &green, &blue); + + strcpy (colorName, rgbLookupTable.lookupName (red, green, blue)); + printf ("best match color name for (%d, %d, %d): %s\n", + red, green, blue, colorName); + + } /* while */ + + return 0; + +} /* main */ +/*----------------------------------------------------------------------------*/ +#endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/colors/rgbNames.h iv-3.1-g++2.7.2/iv/src/examples/colors/rgbNames.h --- iv-3.1/iv/src/examples/colors/rgbNames.h Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/colors/rgbNames.h Tue Apr 2 13:52:29 1996 @@ -0,0 +1,7 @@ +class RGBNames { +public: + RGBNames (); + RGBNames (const char *filename); + char *lookupName (int red, int green, int blue); + void lookupTriplet (int *red, int *green, int *blue); +}; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/colors/sample.X.resources iv-3.1-g++2.7.2/iv/src/examples/colors/sample.X.resources --- iv-3.1/iv/src/examples/colors/sample.X.resources Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/colors/sample.X.resources Tue Apr 2 13:52:29 1996 @@ -0,0 +1,8 @@ +ColorChooser*font: -adobe-new century schoolbook-bold-r-normal--14-* +ColorChooser*FieldEditor*font: fixed +ColorChooser*VScrollBar*flat: gray +ColorChooser*redReadOut*foreground: red +ColorChooser*greenReadOut*foreground: green3 +ColorChooser*blueReadOut*foreground: blue + + diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/Imakefile iv-3.1-g++2.7.2/iv/src/examples/edraw/Imakefile --- iv-3.1/iv/src/examples/edraw/Imakefile Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/Imakefile Tue Apr 2 13:52:29 1996 @@ -0,0 +1,26 @@ +XCOMM +XCOMM generic InterViews demo +XCOMM + +#ifdef InObjectCodeDir + +Use_libInterViews() +ComplexProgramTarget(edraw) + +MakeObjectFromSrc(main) +MakeObjectFromSrc(figure) +MakeObjectFromSrc(figureview) +MakeObjectFromSrc(globals) +MakeObjectFromSrc(glypheditor) +MakeObjectFromSrc(glyphviewer) +MakeObjectFromSrc(idraw) +MakeObjectFromSrc(pacer) +MakeObjectFromSrc(pacemaker) +MakeObjectFromSrc(pacekeeper) +MakeObjectFromSrc(gcollector) + +#else + +MakeInObjectCodeDir() + +#endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/demos/car/car.0 iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/car/car.0 --- iv-3.1/iv/src/examples/edraw/demos/car/car.0 Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/car/car.0 Tue Apr 2 13:52:30 1996 @@ -0,0 +1,2533 @@ +%!PS-Adobe-2.0 EPSF-1.2 +%%Creator: idraw +%%DocumentFonts: +%%Pages: 1 +%%BoundingBox: 22 322 589 521 +%%EndComments + +%%BeginIdrawPrologue +/arrowhead { +0 begin +transform originalCTM itransform +/taily exch def +/tailx exch def +transform originalCTM itransform +/tipy exch def +/tipx exch def +/dy tipy taily sub def +/dx tipx tailx sub def +/angle dx 0 ne dy 0 ne or { dy dx atan } { 90 } ifelse def +gsave +originalCTM setmatrix +tipx tipy translate +angle rotate +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +patternNone not { +originalCTM setmatrix +/padtip arrowHeight 2 exp 0.25 arrowWidth 2 exp mul add sqrt brushWidth mul +arrowWidth div def +/padtail brushWidth 2 div def +tipx tipy translate +angle rotate +padtip 0 translate +arrowHeight padtip add padtail add arrowHeight div dup scale +arrowheadpath +ifill +} if +brushNone not { +originalCTM setmatrix +tipx tipy translate +angle rotate +arrowheadpath +istroke +} if +grestore +end +} dup 0 9 dict put def + +/arrowheadpath { +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +} def + +/leftarrow { +0 begin +y exch get /taily exch def +x exch get /tailx exch def +y exch get /tipy exch def +x exch get /tipx exch def +brushLeftArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +/rightarrow { +0 begin +y exch get /tipy exch def +x exch get /tipx exch def +y exch get /taily exch def +x exch get /tailx exch def +brushRightArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +%%EndIdrawPrologue + +/arrowHeight 10 def +/arrowWidth 5 def + +/IdrawDict 50 dict def +IdrawDict begin + +/none null def +/numGraphicParameters 17 def +/stringLimit 65535 def + +/Begin { +save +numGraphicParameters dict begin +} def + +/End { +end +restore +} def + +/SetB { +dup type /nulltype eq { +pop +false /brushRightArrow idef +false /brushLeftArrow idef +true /brushNone idef +} { +/brushDashOffset idef +/brushDashArray idef +0 ne /brushRightArrow idef +0 ne /brushLeftArrow idef +/brushWidth idef +false /brushNone idef +} ifelse +} def + +/SetCFg { +/fgblue idef +/fggreen idef +/fgred idef +} def + +/SetCBg { +/bgblue idef +/bggreen idef +/bgred idef +} def + +/SetF { +/printSize idef +/printFont idef +} def + +/SetP { +dup type /nulltype eq { +pop true /patternNone idef +} { +dup -1 eq { +/patternGrayLevel idef +/patternString idef +} { +/patternGrayLevel idef +} ifelse +false /patternNone idef +} ifelse +} def + +/BSpl { +0 begin +storexyn +newpath +n 1 gt { +0 0 0 0 0 0 1 1 true subspline +n 2 gt { +0 0 0 0 1 1 2 2 false subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 2 copy false subspline +} if +n 2 sub dup n 1 sub dup 2 copy 2 copy false subspline +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Circ { +newpath +0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/CBSpl { +0 begin +dup 2 gt { +storexyn +newpath +n 1 sub dup 0 0 1 1 2 2 true subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 0 0 false subspline +n 2 sub dup n 1 sub dup 0 0 1 1 false subspline +patternNone not { ifill } if +brushNone not { istroke } if +} { +Poly +} ifelse +end +} dup 0 4 dict put def + +/Elli { +0 begin +newpath +4 2 roll +translate +scale +0 0 1 0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 1 dict put def + +/Line { +0 begin +2 storexyn +newpath +x 0 get y 0 get moveto +x 1 get y 1 get lineto +brushNone not { istroke } if +0 0 1 1 leftarrow +0 0 1 1 rightarrow +end +} dup 0 4 dict put def + +/MLine { +0 begin +storexyn +newpath +n 1 gt { +x 0 get y 0 get moveto +1 1 n 1 sub { +/i exch def +x i get y i get lineto +} for +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Poly { +3 1 roll +newpath +moveto +-1 add +{ lineto } repeat +closepath +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/Rect { +0 begin +/t exch def +/r exch def +/b exch def +/l exch def +newpath +l b moveto +l t lineto +r t lineto +r b lineto +closepath +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 4 dict put def + +/Text { +ishow +} def + +/idef { +dup where { pop pop pop } { exch def } ifelse +} def + +/ifill { +0 begin +gsave +patternGrayLevel -1 ne { +fgred bgred fgred sub patternGrayLevel mul add +fggreen bggreen fggreen sub patternGrayLevel mul add +fgblue bgblue fgblue sub patternGrayLevel mul add setrgbcolor +eofill +} { +eoclip +originalCTM setmatrix +pathbbox /t exch def /r exch def /b exch def /l exch def +/w r l sub ceiling cvi def +/h t b sub ceiling cvi def +/imageByteWidth w 8 div ceiling cvi def +/imageHeight h def +bgred bggreen bgblue setrgbcolor +eofill +fgred fggreen fgblue setrgbcolor +w 0 gt h 0 gt and { +l w add b translate w neg h scale +w h true [w 0 0 h neg 0 h] { patternproc } imagemask +} if +} ifelse +grestore +end +} dup 0 8 dict put def + +/istroke { +gsave +brushDashOffset -1 eq { +[] 0 setdash +1 setgray +} { +brushDashArray brushDashOffset setdash +fgred fggreen fgblue setrgbcolor +} ifelse +brushWidth setlinewidth +originalCTM setmatrix +stroke +grestore +} def + +/ishow { +0 begin +gsave +fgred fggreen fgblue setrgbcolor +/fontDict printFont printSize scalefont dup setfont def +/descender fontDict begin 0 [FontBBox] 1 get FontMatrix end +transform exch pop def +/vertoffset 1 printSize sub descender sub def { +0 vertoffset moveto show +/vertoffset vertoffset printSize sub def +} forall +grestore +end +} dup 0 3 dict put def +/patternproc { +0 begin +/patternByteLength patternString length def +/patternHeight patternByteLength 8 mul sqrt cvi def +/patternWidth patternHeight def +/patternByteWidth patternWidth 8 idiv def +/imageByteMaxLength imageByteWidth imageHeight mul +stringLimit patternByteWidth sub min def +/imageMaxHeight imageByteMaxLength imageByteWidth idiv patternHeight idiv +patternHeight mul patternHeight max def +/imageHeight imageHeight imageMaxHeight sub store +/imageString imageByteWidth imageMaxHeight mul patternByteWidth add string def +0 1 imageMaxHeight 1 sub { +/y exch def +/patternRow y patternByteWidth mul patternByteLength mod def +/patternRowString patternString patternRow patternByteWidth getinterval def +/imageRow y imageByteWidth mul def +0 patternByteWidth imageByteWidth 1 sub { +/x exch def +imageString imageRow x add patternRowString putinterval +} for +} for +imageString +end +} dup 0 12 dict put def + +/min { +dup 3 2 roll dup 4 3 roll lt { exch } if pop +} def + +/max { +dup 3 2 roll dup 4 3 roll gt { exch } if pop +} def + +/midpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 x1 add 2 div +y0 y1 add 2 div +end +} dup 0 4 dict put def + +/thirdpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 2 mul x1 add 3 div +y0 2 mul y1 add 3 div +end +} dup 0 4 dict put def + +/subspline { +0 begin +/movetoNeeded exch def +y exch get /y3 exch def +x exch get /x3 exch def +y exch get /y2 exch def +x exch get /x2 exch def +y exch get /y1 exch def +x exch get /x1 exch def +y exch get /y0 exch def +x exch get /x0 exch def +x1 y1 x2 y2 thirdpoint +/p1y exch def +/p1x exch def +x2 y2 x1 y1 thirdpoint +/p2y exch def +/p2x exch def +x1 y1 x0 y0 thirdpoint +p1x p1y midpoint +/p0y exch def +/p0x exch def +x2 y2 x3 y3 thirdpoint +p2x p2y midpoint +/p3y exch def +/p3x exch def +movetoNeeded { p0x p0y moveto } if +p1x p1y p2x p2y p3x p3y curveto +end +} dup 0 17 dict put def + +/storexyn { +/n exch def +/y n array def +/x n array def +n 1 sub -1 0 { +/i exch def +y i 3 2 roll put +x i 3 2 roll put +} for +} def + +/SSten { +fgred fggreen fgblue setrgbcolor +dup true exch 1 0 0 -1 0 6 -1 roll matrix astore +} def + +/FSten { +dup 3 -1 roll dup 4 1 roll exch +newpath +0 0 moveto +dup 0 exch lineto +exch dup 3 1 roll exch lineto +0 lineto +closepath +bgred bggreen bgblue setrgbcolor +eofill +SSten +} def + +/Rast { +exch dup 3 1 roll 1 0 0 -1 0 6 -1 roll matrix astore +} def + +%%EndProlog + +%I Idraw 10 Grid 4.78348 4.78348 + +%%Page: 1 1 + +Begin +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u +/originalCTM matrix currentmatrix def + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Brown +0.647059 0.164706 0.164706 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +0.25 SetP +%I t +[ 0.246974 0 0 0.246974 -4404.84 -859.899 ] concat +%I 7 +19965 5488 +20008 5485 +20090 5473 +20117 5472 +20133 5460 +20146 5442 +20145 5443 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +0.25 SetP +%I t +[ 0.49395 0 0 0.49395 -9347.3 -2232.21 ] concat +%I 11 +19572 5557 +19572 5557 +19603 5563 +19686 5567 +19792 5564 +19875 5548 +19972 5530 +20028 5518 +20014 5502 +19719 5554 +19586 5554 +11 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Gray +0.745098 0.745098 0.745098 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 -5.95765 -12.0728 ] concat +%I 5 +548 507 +485 520 +423 528 +516 510 +563 502 +5 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Brown +0.647059 0.164706 0.164706 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +0.25 SetP +%I t +[ 0.49395 0 0 0.49395 -9252.2 -2232.21 ] concat +%I 15 +19089 5477 +19089 5477 +18935 5450 +18888 5436 +18859 5422 +18827 5393 +18814 5371 +18812 5352 +18812 5352 +18804 5320 +18782 5288 +18785 5285 +18785 5285 +18787 5282 +19183 5343 +15 CBSpl +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.246974 0 0 0.246974 5219.07 -996.438 ] concat +%I +19246 5616 93 93 Elli +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.246974 0 0 0.246974 -4591.55 -996.198 ] concat +%I +19246 5616 93 93 Elli +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Gray +0.745098 0.745098 0.745098 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.49395 0 0 0.49395 -9347.3 -2232.21 ] concat +%I 8 +19570 5556 +19562 5555 +19278 5477 +19278 5477 +19297 5471 +19333 5467 +19584 5554 +19584 5554 +8 CBSpl +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.987899 0 0 0.987899 -56.1179 204.16 ] concat +%I 28 +256 271 +256 271 +273 278 +326 295 +326 295 +384 312 +409 315 +472 315 +510 312 +517 311 +600 291 +629 290 +637 283 +641 254 +646 250 +637 222 +628 218 +623 212 +595 207 +388 200 +117 200 +106 199 +101 202 +98 213 +101 226 +124 247 +150 255 +234 268 +28 CBSpl +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg LtGray +0.764706 0.764706 0.764706 SetCBg +%I p +1 SetP +%I t +[ 0.987899 0 0 0.987899 -56.1179 204.16 ] concat +%I 12 +271 273 +271 273 +378 306 +378 306 +395 310 +418 311 +418 311 +494 314 +529 297 +559 276 +526 265 +259 257 +12 CBSpl +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.987899 0 0 0.987899 -56.7369 203.172 ] concat +%I 14 +100 211 +100 211 +98 195 +85 179 +84 177 +87 175 +101 175 +590 178 +626 185 +649 203 +652 241 +644 246 +644 246 +99 208 +14 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0617436 0 0 0.0617436 -989.685 119.107 ] concat +%I 9 +18882 5734 +18769 5712 +18759 5684 +18927 5673 +19075 5695 +19073 5699 +19015 5700 +18936 5712 +18879 5732 +9 CBSpl +End + +Begin %I BSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 0.49395 0 0 0.49395 -9252.2 -2232.21 ] concat +%I 20 +19577 5563 +19577 5563 +19575 5560 +19575 5560 +19582 5555 +19582 5555 +19609 5495 +19614 5465 +19614 5465 +19599 5400 +19548 5326 +19538 5290 +19538 5290 +19099 5285 +19099 5285 +19103 5314 +19094 5367 +19121 5453 +19142 5478 +19142 5478 +20 BSpl +%I 1 +End + +Begin %I CBSpl +none SetB %I b n +%I cfg DkGray +0.501961 0.501961 0.501961 SetCFg +%I cbg LtGray +0.764706 0.764706 0.764706 SetCBg +%I p +0 SetP +%I t +[ 1 0 0 1 -0.957678 -15.3728 ] concat +%I 10 +424 527 +444 523 +460 516 +480 504 +489 494 +481 488 +477 487 +474 501 +439 522 +429 525 +10 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Black +0 0 0 SetCBg +%I p +0 SetP +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat +%I 10 +439 483 +465 487 +480 491 +487 497 +486 492 +480 488 +474 486 +468 485 +460 484 +436 482 +10 CBSpl +End + +Begin %I CBSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 0.987899 0 0 0.987899 -56.1179 204.16 ] concat +%I 12 +271 273 +271 273 +378 306 +378 306 +395 310 +418 311 +418 311 +494 314 +529 297 +559 276 +526 265 +259 257 +12 CBSpl +End + +Begin %I BSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Orange* +1 0.498039 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 1 0 0 1 -0.957678 -16.0728 ] concat +%I 6 +78 433 +90 452 +112 460 +134 459 +149 452 +160 438 +6 BSpl +%I 1 +End + +Begin %I BSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Orange* +1 0.498039 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat +%I 8 +459 431 +469 454 +487 464 +508 467 +522 463 +535 455 +542 444 +545 432 +8 BSpl +%I 1 +End + +Begin %I BSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +none SetP %I p n +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat +%I 9 +42 426 +77 425 +161 429 +314 440 +462 434 +504 432 +543 432 +568 450 +579 461 +9 BSpl +%I 1 +End + +Begin %I BSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +none SetP %I p n +%I t +[ 1 0 0 1 1.04232 -18.0728 ] concat +%I 9 +41 426 +77 425 +161 429 +314 440 +462 434 +504 432 +543 432 +568 450 +579 461 +9 BSpl +%I 1 +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.246955 0.00310132 -0.00310132 0.246955 -4571.16 -1068.8 ] concat +%I 15 +18870 5610 +18869 5612 +18869 5687 +18888 5758 +18923 5810 +18970 5843 +19023 5863 +19112 5864 +19162 5842 +19205 5813 +19238 5769 +19258 5711 +19264 5657 +19259 5611 +19259 5611 +15 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.246747 0.0106122 -0.0106122 0.246747 -4141.77 -1204.88 ] concat +%I 15 +18870 5610 +18869 5612 +18869 5687 +18888 5758 +18923 5810 +18970 5843 +19023 5863 +19112 5864 +19162 5842 +19205 5813 +19238 5769 +19258 5711 +19264 5657 +19259 5611 +19259 5611 +15 CBSpl +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +0 SetP +%I t +[ 0.368358 0.000150219 -0.000150219 0.368358 154.217 313.301 ] concat +%I 14 +33 248 +50 206 +62 196 +103 195 +762 205 +779 207 +804 226 +823 264 +825 263 +844 178 +818 177 +33 167 +33 167 +30 245 +14 CBSpl +End + +Begin %I MLine +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Orange* +1 0.498039 0 SetCBg +%I p +0.25 SetP +%I t +[ 1 0 0 1 0.0423822 -15.0728 ] concat +%I 3 +42 426 +41 426 +40 427 +3 MLine +%I 1 +End + +Begin %I BSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Orange* +1 0.498039 0 SetCBg +%I p +0.25 SetP +%I t +[ 1 0 0 1 0.0423822 -15.0728 ] concat +%I 3 +42 423 +40 423 +39 424 +3 BSpl +%I 1 +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 0.0423222 -20.6498 ] concat + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg DkGray +0.501961 0.501961 0.501961 SetCBg +%I p +0.25 SetP +%I t +[ -0.425499 -0.104024 0.104024 -0.425499 220.603 607.984 ] concat +%I +335 397 106 106 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.21275 -0.0520125 0.0520125 -0.21275 168.881 499.063 ] concat +%I +323 366 167 167 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ -0.21275 -0.0520125 0.0520125 -0.21275 168.983 498.637 ] concat +%I +323 364 160 160 Elli +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.275268 -0.06432 0.06432 -0.275268 184.254 519.796 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.229141 -0.059905 0.059905 -0.229141 171.204 497.91 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.275268 0.06432 -0.06432 0.275268 54.1409 288.995 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.229141 0.059905 -0.059905 0.229141 67.1955 310.884 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.06432 -0.275268 0.275268 0.06432 3.79382 469.454 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.059905 -0.229141 0.229141 0.059905 25.689 456.406 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.06432 0.275268 -0.275268 -0.06432 234.596 339.341 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.059905 0.229141 -0.229141 -0.059905 212.709 352.396 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.149571 -0.23987 0.23987 -0.149571 83.8157 532.061 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.120016 -0.204182 0.204182 -0.120016 90.0264 507.345 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.149571 0.23987 -0.23987 0.149571 154.58 276.736 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.120016 0.204182 -0.204182 0.120016 148.372 301.452 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.23987 -0.149571 0.149571 0.23987 -8.46533 369.019 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.204182 -0.120016 0.120016 0.204182 16.2515 375.226 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.23987 0.149571 -0.149571 -0.23987 246.86 439.778 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.204182 0.120016 -0.120016 -0.204182 222.144 433.571 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ -0.21275 -0.0520125 0.0520125 -0.21275 168.983 498.637 ] concat +%I +323 364 70 70 Elli +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ -0.21275 -0.0520125 0.0520125 -0.21275 168.453 498.96 ] concat +%I +321 366 64 64 Elli +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ -0.21275 -0.0520125 0.0520125 -0.21275 168.531 498.641 ] concat +%I +328 359 382 370 Rect +End + +End %I eop + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg DkGray +0.501961 0.501961 0.501961 SetCBg +%I p +0.25 SetP +%I t +[ 0.364051 0.243593 -0.243593 0.364051 477.84 178.046 ] concat +%I +335 397 106 106 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.182026 0.121796 -0.121796 0.182026 489.089 298.094 ] concat +%I +323 366 167 167 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 0.182026 0.121796 -0.121796 0.182026 488.844 298.459 ] concat +%I +323 364 160 160 Elli +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.236535 0.154791 -0.154791 0.236535 481.752 273.348 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.194718 0.13483 -0.13483 0.194718 486.507 298.382 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.236535 -0.154791 0.154791 -0.236535 524.851 534.768 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.194718 -0.13483 0.13483 -0.194718 520.099 509.734 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.154791 0.236535 -0.236535 -0.154791 634.01 382.504 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.13483 0.194718 -0.194718 -0.13483 608.984 387.26 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.154791 -0.236535 0.236535 0.154791 372.596 425.605 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.13483 -0.194718 0.194718 0.13483 397.633 420.848 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.0582733 0.276611 -0.276611 0.0582733 580.311 296.26 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0427443 0.232952 -0.232952 0.0427443 566.004 317.348 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.0582733 -0.276611 0.276611 -0.0582733 426.302 511.856 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.0427443 -0.232952 0.232952 -0.0427443 440.606 490.761 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.276611 0.0582733 -0.0582733 -0.276611 611.098 481.057 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.232952 0.0427443 -0.0427443 -0.232952 590.013 466.752 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.276611 -0.0582733 0.0582733 0.276611 395.509 327.053 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.232952 -0.0427443 0.0427443 0.232952 416.598 341.358 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 0.182026 0.121796 -0.121796 0.182026 488.844 298.459 ] concat +%I +323 364 70 70 Elli +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 0.182026 0.121796 -0.121796 0.182026 489.455 298.339 ] concat +%I +321 366 64 64 Elli +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 0.182026 0.121796 -0.121796 0.182026 489.272 298.613 ] concat +%I +328 359 382 370 Rect +End + +End %I eop + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg Black +0 0 0 SetCFg +%I cbg Orange* +1 0.498039 0 SetCBg +%I f u +%I p +1 SetP +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109455 0 0 0.109455 18.1006 359.423 ] concat +%I 10 +315 513 +267 513 +267 481 +267 441 +315 441 +403 441 +443 441 +443 489 +443 513 +403 513 +10 CBSpl +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109455 0 0 0.109455 18.1006 359.861 ] concat +%I +275 449 435 497 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.9375 SetP +%I t +[ 0.109455 0 0 0.109455 18.2113 359.423 ] concat +%I +279 459 429 495 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109455 0 0 0.109455 18.2113 359.423 ] concat +%I +354 466 420 480 Rect +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 -392.958 6.92719 ] concat + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0200194 0 0 0.0200194 567.919 432.276 ] concat +%I 5 +77 491 +197 491 +125 347 +-19 347 +53 491 +5 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0200194 0 0 0.0200194 550.297 432.276 ] concat +%I 8 +293 491 +437 491 +413 443 +365 443 +309 347 +261 347 +317 443 +269 443 +8 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0200194 0 0 0.0200194 553.502 432.116 ] concat +%I 8 +293 499 +221 355 +365 355 +437 499 +381 499 +325 387 +285 387 +341 499 +8 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0200194 0 0 0.0200194 556.706 432.116 ] concat +%I 6 +293 499 +221 355 +365 355 +365 411 +389 411 +437 499 +6 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0200194 0 0 0.0200194 559.911 432.116 ] concat +%I 7 +293 499 +221 355 +365 355 +397 419 +381 419 +405 435 +437 499 +7 Poly +End + +Begin %I Rect +none SetB %I b n +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.0400389 0 0 0.0400389 549.398 424.208 ] concat +%I +101 403 525 419 Rect +End + +Begin %I Poly +none SetB %I b n +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0200194 0 0 0.0200194 557.023 432.116 ] concat +%I 4 +661 443 +685 443 +669 411 +645 411 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I f u +%I p u +%I t +[ 1 0 0 1 -3.95768 -15.0728 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.19425 0 0 0.19425 -3148.29 -660.198 ] concat +%I +18301 5809 18390 5840 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.19425 0 0 0.19425 -3148.1 -660.39 ] concat +%I +18308 5810 18381 5833 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.19425 0 0 0.19425 -3148.1 -660.007 ] concat +%I +18318 5808 18371 5823 Rect +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I f u +%I p u +%I t +[ 1 0 0 1 -4.95768 -16.0728 ] concat + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.49395 0 0 0.49395 -8633.11 -2414.19 ] concat +%I +18345 5842 5 5 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.0338321 0 0 0.0338321 -192.313 273.825 ] concat +%I +18332 5784 18362 5899 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.0338321 0 0 0.0338321 -192.21 273.825 ] concat +%I +18345 5798 18359 5878 Rect +End + +End %I eop + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I f u +%I p +1 SetP +%I t +[ 0.984808 0.173648 -0.173648 0.984808 77.6337 -97.9683 ] concat + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109454 0 0 0.109454 523.908 397.215 ] concat +%I 10 +315 513 +267 513 +267 481 +267 441 +315 441 +403 441 +443 441 +443 489 +443 513 +403 513 +10 CBSpl +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109454 0 0 0.109454 523.908 397.649 ] concat +%I +275 449 435 497 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.9375 SetP +%I t +[ 0.109454 0 0 0.109454 524.011 397.215 ] concat +%I +279 459 429 495 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109454 0 0 0.109454 524.011 397.215 ] concat +%I +354 466 420 480 Rect +End + +End %I eop + +Begin %I Pict +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I f u +%I p +1 SetP +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.13381 0.111318 0.111318 -0.13381 176.753 541.62 ] concat +%I 10 +248 468 +361 461 +361 484 +283 483 +383 524 +387 494 +412 500 +406 534 +405 541 +242 471 +10 Poly +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.173119 -0.0180789 0.0180789 0.173119 213.254 451.954 ] concat +%I 5 +365 499 +238 451 +243 389 +377 381 +411 453 +5 CBSpl +End + +End %I eop + +End %I eop + +showpage + +%%Trailer + +end diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/demos/car/car.1 iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/car/car.1 --- iv-3.1/iv/src/examples/edraw/demos/car/car.1 Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/car/car.1 Tue Apr 2 13:52:30 1996 @@ -0,0 +1,1823 @@ +%!PS-Adobe-2.0 EPSF-1.2 +%%Creator: idraw +%%DocumentFonts: +%%Pages: 1 +%%BoundingBox: 23 322 589 521 +%%EndComments + +%%BeginIdrawPrologue +/arrowhead { +0 begin +transform originalCTM itransform +/taily exch def +/tailx exch def +transform originalCTM itransform +/tipy exch def +/tipx exch def +/dy tipy taily sub def +/dx tipx tailx sub def +/angle dx 0 ne dy 0 ne or { dy dx atan } { 90 } ifelse def +gsave +originalCTM setmatrix +tipx tipy translate +angle rotate +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +patternNone not { +originalCTM setmatrix +/padtip arrowHeight 2 exp 0.25 arrowWidth 2 exp mul add sqrt brushWidth mul +arrowWidth div def +/padtail brushWidth 2 div def +tipx tipy translate +angle rotate +padtip 0 translate +arrowHeight padtip add padtail add arrowHeight div dup scale +arrowheadpath +ifill +} if +brushNone not { +originalCTM setmatrix +tipx tipy translate +angle rotate +arrowheadpath +istroke +} if +grestore +end +} dup 0 9 dict put def + +/arrowheadpath { +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +} def + +/leftarrow { +0 begin +y exch get /taily exch def +x exch get /tailx exch def +y exch get /tipy exch def +x exch get /tipx exch def +brushLeftArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +/rightarrow { +0 begin +y exch get /tipy exch def +x exch get /tipx exch def +y exch get /taily exch def +x exch get /tailx exch def +brushRightArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +%%EndIdrawPrologue + +/arrowHeight 10 def +/arrowWidth 5 def + +/IdrawDict 50 dict def +IdrawDict begin + +/none null def +/numGraphicParameters 17 def +/stringLimit 65535 def + +/Begin { +save +numGraphicParameters dict begin +} def + +/End { +end +restore +} def + +/SetB { +dup type /nulltype eq { +pop +false /brushRightArrow idef +false /brushLeftArrow idef +true /brushNone idef +} { +/brushDashOffset idef +/brushDashArray idef +0 ne /brushRightArrow idef +0 ne /brushLeftArrow idef +/brushWidth idef +false /brushNone idef +} ifelse +} def + +/SetCFg { +/fgblue idef +/fggreen idef +/fgred idef +} def + +/SetCBg { +/bgblue idef +/bggreen idef +/bgred idef +} def + +/SetF { +/printSize idef +/printFont idef +} def + +/SetP { +dup type /nulltype eq { +pop true /patternNone idef +} { +dup -1 eq { +/patternGrayLevel idef +/patternString idef +} { +/patternGrayLevel idef +} ifelse +false /patternNone idef +} ifelse +} def + +/BSpl { +0 begin +storexyn +newpath +n 1 gt { +0 0 0 0 0 0 1 1 true subspline +n 2 gt { +0 0 0 0 1 1 2 2 false subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 2 copy false subspline +} if +n 2 sub dup n 1 sub dup 2 copy 2 copy false subspline +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Circ { +newpath +0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/CBSpl { +0 begin +dup 2 gt { +storexyn +newpath +n 1 sub dup 0 0 1 1 2 2 true subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 0 0 false subspline +n 2 sub dup n 1 sub dup 0 0 1 1 false subspline +patternNone not { ifill } if +brushNone not { istroke } if +} { +Poly +} ifelse +end +} dup 0 4 dict put def + +/Elli { +0 begin +newpath +4 2 roll +translate +scale +0 0 1 0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 1 dict put def + +/Line { +0 begin +2 storexyn +newpath +x 0 get y 0 get moveto +x 1 get y 1 get lineto +brushNone not { istroke } if +0 0 1 1 leftarrow +0 0 1 1 rightarrow +end +} dup 0 4 dict put def + +/MLine { +0 begin +storexyn +newpath +n 1 gt { +x 0 get y 0 get moveto +1 1 n 1 sub { +/i exch def +x i get y i get lineto +} for +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Poly { +3 1 roll +newpath +moveto +-1 add +{ lineto } repeat +closepath +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/Rect { +0 begin +/t exch def +/r exch def +/b exch def +/l exch def +newpath +l b moveto +l t lineto +r t lineto +r b lineto +closepath +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 4 dict put def + +/Text { +ishow +} def + +/idef { +dup where { pop pop pop } { exch def } ifelse +} def + +/ifill { +0 begin +gsave +patternGrayLevel -1 ne { +fgred bgred fgred sub patternGrayLevel mul add +fggreen bggreen fggreen sub patternGrayLevel mul add +fgblue bgblue fgblue sub patternGrayLevel mul add setrgbcolor +eofill +} { +eoclip +originalCTM setmatrix +pathbbox /t exch def /r exch def /b exch def /l exch def +/w r l sub ceiling cvi def +/h t b sub ceiling cvi def +/imageByteWidth w 8 div ceiling cvi def +/imageHeight h def +bgred bggreen bgblue setrgbcolor +eofill +fgred fggreen fgblue setrgbcolor +w 0 gt h 0 gt and { +l w add b translate w neg h scale +w h true [w 0 0 h neg 0 h] { patternproc } imagemask +} if +} ifelse +grestore +end +} dup 0 8 dict put def + +/istroke { +gsave +brushDashOffset -1 eq { +[] 0 setdash +1 setgray +} { +brushDashArray brushDashOffset setdash +fgred fggreen fgblue setrgbcolor +} ifelse +brushWidth setlinewidth +originalCTM setmatrix +stroke +grestore +} def + +/ishow { +0 begin +gsave +fgred fggreen fgblue setrgbcolor +/fontDict printFont printSize scalefont dup setfont def +/descender fontDict begin 0 [FontBBox] 1 get FontMatrix end +transform exch pop def +/vertoffset 1 printSize sub descender sub def { +0 vertoffset moveto show +/vertoffset vertoffset printSize sub def +} forall +grestore +end +} dup 0 3 dict put def +/patternproc { +0 begin +/patternByteLength patternString length def +/patternHeight patternByteLength 8 mul sqrt cvi def +/patternWidth patternHeight def +/patternByteWidth patternWidth 8 idiv def +/imageByteMaxLength imageByteWidth imageHeight mul +stringLimit patternByteWidth sub min def +/imageMaxHeight imageByteMaxLength imageByteWidth idiv patternHeight idiv +patternHeight mul patternHeight max def +/imageHeight imageHeight imageMaxHeight sub store +/imageString imageByteWidth imageMaxHeight mul patternByteWidth add string def +0 1 imageMaxHeight 1 sub { +/y exch def +/patternRow y patternByteWidth mul patternByteLength mod def +/patternRowString patternString patternRow patternByteWidth getinterval def +/imageRow y imageByteWidth mul def +0 patternByteWidth imageByteWidth 1 sub { +/x exch def +imageString imageRow x add patternRowString putinterval +} for +} for +imageString +end +} dup 0 12 dict put def + +/min { +dup 3 2 roll dup 4 3 roll lt { exch } if pop +} def + +/max { +dup 3 2 roll dup 4 3 roll gt { exch } if pop +} def + +/midpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 x1 add 2 div +y0 y1 add 2 div +end +} dup 0 4 dict put def + +/thirdpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 2 mul x1 add 3 div +y0 2 mul y1 add 3 div +end +} dup 0 4 dict put def + +/subspline { +0 begin +/movetoNeeded exch def +y exch get /y3 exch def +x exch get /x3 exch def +y exch get /y2 exch def +x exch get /x2 exch def +y exch get /y1 exch def +x exch get /x1 exch def +y exch get /y0 exch def +x exch get /x0 exch def +x1 y1 x2 y2 thirdpoint +/p1y exch def +/p1x exch def +x2 y2 x1 y1 thirdpoint +/p2y exch def +/p2x exch def +x1 y1 x0 y0 thirdpoint +p1x p1y midpoint +/p0y exch def +/p0x exch def +x2 y2 x3 y3 thirdpoint +p2x p2y midpoint +/p3y exch def +/p3x exch def +movetoNeeded { p0x p0y moveto } if +p1x p1y p2x p2y p3x p3y curveto +end +} dup 0 17 dict put def + +/storexyn { +/n exch def +/y n array def +/x n array def +n 1 sub -1 0 { +/i exch def +y i 3 2 roll put +x i 3 2 roll put +} for +} def + +/SSten { +fgred fggreen fgblue setrgbcolor +dup true exch 1 0 0 -1 0 6 -1 roll matrix astore +} def + +/FSten { +dup 3 -1 roll dup 4 1 roll exch +newpath +0 0 moveto +dup 0 exch lineto +exch dup 3 1 roll exch lineto +0 lineto +closepath +bgred bggreen bgblue setrgbcolor +eofill +SSten +} def + +/Rast { +exch dup 3 1 roll 1 0 0 -1 0 6 -1 roll matrix astore +} def + +%%EndProlog + +%I Idraw 10 Grid 4.78348 4.78348 + +%%Page: 1 1 + +Begin +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u +/originalCTM matrix currentmatrix def + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 -26.69 106.362 ] concat +%I 28 +273 463 +284 465 +305 470 +367 489 +367 489 +436 512 +470 513 +531 515 +595 510 +604 508 +707 484 +743 482 +753 474 +758 438 +764 433 +753 398 +742 393 +736 386 +701 379 +444 371 +108 371 +94 370 +88 373 +85 387 +88 403 +117 429 +149 439 +253 455 +28 CBSpl +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg LtGray +0.764706 0.764706 0.764706 SetCBg +%I p +1 SetP +%I t +[ 0.987899 0 0 0.987899 -56.1179 204.16 ] concat +%I 12 +271 273 +271 273 +378 306 +378 306 +395 310 +418 311 +418 311 +494 314 +529 297 +559 276 +526 265 +259 257 +12 CBSpl +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.987899 0 0 0.987899 -56.7369 203.172 ] concat +%I 14 +100 211 +100 211 +98 195 +85 179 +84 177 +87 175 +101 175 +590 178 +626 185 +649 203 +652 241 +644 246 +644 246 +99 208 +14 CBSpl +End + +Begin %I CBSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 0.987899 0 0 0.987899 -56.1179 204.16 ] concat +%I 12 +271 273 +271 273 +378 306 +378 306 +395 310 +418 311 +418 311 +494 314 +529 297 +559 276 +526 265 +259 257 +12 CBSpl +End + +Begin %I BSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +none SetP %I p n +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat +%I 9 +42 426 +77 425 +161 429 +314 440 +462 434 +504 432 +543 432 +568 450 +579 461 +9 BSpl +%I 1 +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.246955 0.00310132 -0.00310132 0.246955 -4571.16 -1068.8 ] concat +%I 15 +18870 5610 +18869 5612 +18869 5687 +18888 5758 +18923 5810 +18970 5843 +19023 5863 +19112 5864 +19162 5842 +19205 5813 +19238 5769 +19258 5711 +19264 5657 +19259 5611 +19259 5611 +15 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.246747 0.0106122 -0.0106122 0.246747 -4141.77 -1204.88 ] concat +%I 15 +18870 5610 +18869 5612 +18869 5687 +18888 5758 +18923 5810 +18970 5843 +19023 5863 +19112 5864 +19162 5842 +19205 5813 +19238 5769 +19258 5711 +19264 5657 +19259 5611 +19259 5611 +15 CBSpl +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +0 SetP +%I t +[ 0.368358 0.000150219 -0.000150219 0.368358 154.217 313.301 ] concat +%I 14 +33 248 +50 206 +62 196 +103 195 +762 205 +779 207 +804 226 +823 264 +825 263 +844 178 +818 177 +33 167 +33 167 +30 245 +14 CBSpl +End + +Begin %I BSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 0.796717 -0 -0 0.796717 -26.69 106.362 ] concat +%I 20 +559 511 +558 514 +557 512 +557 512 +561 509 +561 509 +578 472 +581 453 +581 453 +572 413 +540 367 +534 344 +534 344 +262 341 +262 341 +264 359 +259 392 +275 446 +285 464 +288 461 +20 BSpl +%I 1 +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 0.0423222 -20.6498 ] concat + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg DkGray +0.501961 0.501961 0.501961 SetCBg +%I p +0.25 SetP +%I t +[ -0.425499 -0.104024 0.104024 -0.425499 220.603 607.984 ] concat +%I +335 397 106 106 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.21275 -0.0520125 0.0520125 -0.21275 168.881 499.063 ] concat +%I +323 366 167 167 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ -0.21275 -0.0520125 0.0520125 -0.21275 168.983 498.637 ] concat +%I +323 364 160 160 Elli +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.229141 -0.059905 0.059905 -0.229141 171.204 497.91 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.229141 0.059905 -0.059905 0.229141 67.1955 310.884 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.059905 -0.229141 0.229141 0.059905 25.689 456.406 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.059905 0.229141 -0.229141 -0.059905 212.709 352.396 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.120016 -0.204182 0.204182 -0.120016 90.0264 507.345 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.120016 0.204182 -0.204182 0.120016 148.372 301.452 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.204182 -0.120016 0.120016 0.204182 16.2515 375.226 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.204182 0.120016 -0.120016 -0.204182 222.144 433.571 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ -0.21275 -0.0520125 0.0520125 -0.21275 168.983 498.637 ] concat +%I +323 364 70 70 Elli +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ -0.21275 -0.0520125 0.0520125 -0.21275 168.531 498.641 ] concat +%I +328 359 382 370 Rect +End + +End %I eop + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg DkGray +0.501961 0.501961 0.501961 SetCBg +%I p +0.25 SetP +%I t +[ 0.364051 0.243593 -0.243593 0.364051 477.84 178.046 ] concat +%I +335 397 106 106 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.182026 0.121796 -0.121796 0.182026 489.089 298.094 ] concat +%I +323 366 167 167 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 0.182026 0.121796 -0.121796 0.182026 488.844 298.459 ] concat +%I +323 364 160 160 Elli +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.194718 0.13483 -0.13483 0.194718 486.507 298.382 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.194718 -0.13483 0.13483 -0.194718 520.099 509.734 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.13483 0.194718 -0.194718 -0.13483 608.984 387.26 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.13483 -0.194718 0.194718 0.13483 397.633 420.848 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0427443 0.232952 -0.232952 0.0427443 566.004 317.348 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.0427443 -0.232952 0.232952 -0.0427443 440.606 490.761 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.232952 0.0427443 -0.0427443 -0.232952 590.013 466.752 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.232952 -0.0427443 0.0427443 0.232952 416.598 341.358 ] concat +%I 7 +322 455 +273 455 +284 430 +312 428 +325 444 +359 456 +359 456 +7 CBSpl +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 0.182026 0.121796 -0.121796 0.182026 488.844 298.459 ] concat +%I +323 364 70 70 Elli +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 0.182026 0.121796 -0.121796 0.182026 489.272 298.613 ] concat +%I +328 359 382 370 Rect +End + +End %I eop + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg Black +0 0 0 SetCFg +%I cbg Orange* +1 0.498039 0 SetCBg +%I f u +%I p +1 SetP +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109455 0 0 0.109455 18.1006 359.423 ] concat +%I 10 +315 513 +267 513 +267 481 +267 441 +315 441 +403 441 +443 441 +443 489 +443 513 +403 513 +10 CBSpl +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109455 0 0 0.109455 18.1006 359.861 ] concat +%I +275 449 435 497 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.9375 SetP +%I t +[ 0.109455 0 0 0.109455 18.2113 359.423 ] concat +%I +279 459 429 495 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109455 0 0 0.109455 18.2113 359.423 ] concat +%I +354 466 420 480 Rect +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 -392.958 6.92719 ] concat + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0200194 0 0 0.0200194 567.919 432.276 ] concat +%I 5 +77 491 +197 491 +125 347 +-19 347 +53 491 +5 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0200194 0 0 0.0200194 550.297 432.276 ] concat +%I 8 +293 491 +437 491 +413 443 +365 443 +309 347 +261 347 +317 443 +269 443 +8 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0200194 0 0 0.0200194 553.502 432.116 ] concat +%I 8 +293 499 +221 355 +365 355 +437 499 +381 499 +325 387 +285 387 +341 499 +8 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0200194 0 0 0.0200194 556.706 432.116 ] concat +%I 6 +293 499 +221 355 +365 355 +365 411 +389 411 +437 499 +6 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0200194 0 0 0.0200194 559.911 432.116 ] concat +%I 7 +293 499 +221 355 +365 355 +397 419 +381 419 +405 435 +437 499 +7 Poly +End + +Begin %I Rect +none SetB %I b n +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.0400389 0 0 0.0400389 549.398 424.208 ] concat +%I +101 403 525 419 Rect +End + +Begin %I Poly +none SetB %I b n +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0200194 0 0 0.0200194 557.023 432.116 ] concat +%I 4 +661 443 +685 443 +669 411 +645 411 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I f u +%I p u +%I t +[ 1 0 0 1 -3.95768 -15.0728 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.19425 0 0 0.19425 -3148.29 -660.198 ] concat +%I +18301 5809 18390 5840 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.19425 0 0 0.19425 -3148.1 -660.39 ] concat +%I +18308 5810 18381 5833 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.19425 0 0 0.19425 -3148.1 -660.007 ] concat +%I +18318 5808 18371 5823 Rect +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I f u +%I p u +%I t +[ 1 0 0 1 -4.95768 -16.0728 ] concat + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.49395 0 0 0.49395 -8633.11 -2414.19 ] concat +%I +18345 5842 5 5 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.0338321 0 0 0.0338321 -192.313 273.825 ] concat +%I +18332 5784 18362 5899 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.0338321 0 0 0.0338321 -192.21 273.825 ] concat +%I +18345 5798 18359 5878 Rect +End + +End %I eop + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I f u +%I p +1 SetP +%I t +[ 0.984808 0.173648 -0.173648 0.984808 77.6337 -97.9683 ] concat + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109454 0 0 0.109454 523.908 397.215 ] concat +%I 10 +315 513 +267 513 +267 481 +267 441 +315 441 +403 441 +443 441 +443 489 +443 513 +403 513 +10 CBSpl +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109454 0 0 0.109454 523.908 397.649 ] concat +%I +275 449 435 497 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.9375 SetP +%I t +[ 0.109454 0 0 0.109454 524.011 397.215 ] concat +%I +279 459 429 495 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109454 0 0 0.109454 524.011 397.215 ] concat +%I +354 466 420 480 Rect +End + +End %I eop + +Begin %I Pict +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I f u +%I p +1 SetP +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.13381 0.111318 0.111318 -0.13381 176.753 541.62 ] concat +%I 10 +248 468 +361 461 +361 484 +283 483 +383 524 +387 494 +412 500 +406 534 +405 541 +242 471 +10 Poly +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.173119 -0.0180789 0.0180789 0.173119 213.254 451.954 ] concat +%I 5 +365 499 +238 451 +243 389 +377 381 +411 453 +5 CBSpl +End + +End %I eop + +End %I eop + +showpage + +%%Trailer + +end diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/demos/car/car.2 iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/car/car.2 --- iv-3.1/iv/src/examples/edraw/demos/car/car.2 Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/car/car.2 Tue Apr 2 13:52:30 1996 @@ -0,0 +1,1404 @@ +%!PS-Adobe-2.0 EPSF-1.2 +%%Creator: idraw +%%DocumentFonts: +%%Pages: 1 +%%BoundingBox: 23 322 589 521 +%%EndComments + +%%BeginIdrawPrologue +/arrowhead { +0 begin +transform originalCTM itransform +/taily exch def +/tailx exch def +transform originalCTM itransform +/tipy exch def +/tipx exch def +/dy tipy taily sub def +/dx tipx tailx sub def +/angle dx 0 ne dy 0 ne or { dy dx atan } { 90 } ifelse def +gsave +originalCTM setmatrix +tipx tipy translate +angle rotate +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +patternNone not { +originalCTM setmatrix +/padtip arrowHeight 2 exp 0.25 arrowWidth 2 exp mul add sqrt brushWidth mul +arrowWidth div def +/padtail brushWidth 2 div def +tipx tipy translate +angle rotate +padtip 0 translate +arrowHeight padtip add padtail add arrowHeight div dup scale +arrowheadpath +ifill +} if +brushNone not { +originalCTM setmatrix +tipx tipy translate +angle rotate +arrowheadpath +istroke +} if +grestore +end +} dup 0 9 dict put def + +/arrowheadpath { +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +} def + +/leftarrow { +0 begin +y exch get /taily exch def +x exch get /tailx exch def +y exch get /tipy exch def +x exch get /tipx exch def +brushLeftArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +/rightarrow { +0 begin +y exch get /tipy exch def +x exch get /tipx exch def +y exch get /taily exch def +x exch get /tailx exch def +brushRightArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +%%EndIdrawPrologue + +/arrowHeight 10 def +/arrowWidth 5 def + +/IdrawDict 50 dict def +IdrawDict begin + +/none null def +/numGraphicParameters 17 def +/stringLimit 65535 def + +/Begin { +save +numGraphicParameters dict begin +} def + +/End { +end +restore +} def + +/SetB { +dup type /nulltype eq { +pop +false /brushRightArrow idef +false /brushLeftArrow idef +true /brushNone idef +} { +/brushDashOffset idef +/brushDashArray idef +0 ne /brushRightArrow idef +0 ne /brushLeftArrow idef +/brushWidth idef +false /brushNone idef +} ifelse +} def + +/SetCFg { +/fgblue idef +/fggreen idef +/fgred idef +} def + +/SetCBg { +/bgblue idef +/bggreen idef +/bgred idef +} def + +/SetF { +/printSize idef +/printFont idef +} def + +/SetP { +dup type /nulltype eq { +pop true /patternNone idef +} { +dup -1 eq { +/patternGrayLevel idef +/patternString idef +} { +/patternGrayLevel idef +} ifelse +false /patternNone idef +} ifelse +} def + +/BSpl { +0 begin +storexyn +newpath +n 1 gt { +0 0 0 0 0 0 1 1 true subspline +n 2 gt { +0 0 0 0 1 1 2 2 false subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 2 copy false subspline +} if +n 2 sub dup n 1 sub dup 2 copy 2 copy false subspline +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Circ { +newpath +0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/CBSpl { +0 begin +dup 2 gt { +storexyn +newpath +n 1 sub dup 0 0 1 1 2 2 true subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 0 0 false subspline +n 2 sub dup n 1 sub dup 0 0 1 1 false subspline +patternNone not { ifill } if +brushNone not { istroke } if +} { +Poly +} ifelse +end +} dup 0 4 dict put def + +/Elli { +0 begin +newpath +4 2 roll +translate +scale +0 0 1 0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 1 dict put def + +/Line { +0 begin +2 storexyn +newpath +x 0 get y 0 get moveto +x 1 get y 1 get lineto +brushNone not { istroke } if +0 0 1 1 leftarrow +0 0 1 1 rightarrow +end +} dup 0 4 dict put def + +/MLine { +0 begin +storexyn +newpath +n 1 gt { +x 0 get y 0 get moveto +1 1 n 1 sub { +/i exch def +x i get y i get lineto +} for +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Poly { +3 1 roll +newpath +moveto +-1 add +{ lineto } repeat +closepath +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/Rect { +0 begin +/t exch def +/r exch def +/b exch def +/l exch def +newpath +l b moveto +l t lineto +r t lineto +r b lineto +closepath +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 4 dict put def + +/Text { +ishow +} def + +/idef { +dup where { pop pop pop } { exch def } ifelse +} def + +/ifill { +0 begin +gsave +patternGrayLevel -1 ne { +fgred bgred fgred sub patternGrayLevel mul add +fggreen bggreen fggreen sub patternGrayLevel mul add +fgblue bgblue fgblue sub patternGrayLevel mul add setrgbcolor +eofill +} { +eoclip +originalCTM setmatrix +pathbbox /t exch def /r exch def /b exch def /l exch def +/w r l sub ceiling cvi def +/h t b sub ceiling cvi def +/imageByteWidth w 8 div ceiling cvi def +/imageHeight h def +bgred bggreen bgblue setrgbcolor +eofill +fgred fggreen fgblue setrgbcolor +w 0 gt h 0 gt and { +l w add b translate w neg h scale +w h true [w 0 0 h neg 0 h] { patternproc } imagemask +} if +} ifelse +grestore +end +} dup 0 8 dict put def + +/istroke { +gsave +brushDashOffset -1 eq { +[] 0 setdash +1 setgray +} { +brushDashArray brushDashOffset setdash +fgred fggreen fgblue setrgbcolor +} ifelse +brushWidth setlinewidth +originalCTM setmatrix +stroke +grestore +} def + +/ishow { +0 begin +gsave +fgred fggreen fgblue setrgbcolor +/fontDict printFont printSize scalefont dup setfont def +/descender fontDict begin 0 [FontBBox] 1 get FontMatrix end +transform exch pop def +/vertoffset 1 printSize sub descender sub def { +0 vertoffset moveto show +/vertoffset vertoffset printSize sub def +} forall +grestore +end +} dup 0 3 dict put def +/patternproc { +0 begin +/patternByteLength patternString length def +/patternHeight patternByteLength 8 mul sqrt cvi def +/patternWidth patternHeight def +/patternByteWidth patternWidth 8 idiv def +/imageByteMaxLength imageByteWidth imageHeight mul +stringLimit patternByteWidth sub min def +/imageMaxHeight imageByteMaxLength imageByteWidth idiv patternHeight idiv +patternHeight mul patternHeight max def +/imageHeight imageHeight imageMaxHeight sub store +/imageString imageByteWidth imageMaxHeight mul patternByteWidth add string def +0 1 imageMaxHeight 1 sub { +/y exch def +/patternRow y patternByteWidth mul patternByteLength mod def +/patternRowString patternString patternRow patternByteWidth getinterval def +/imageRow y imageByteWidth mul def +0 patternByteWidth imageByteWidth 1 sub { +/x exch def +imageString imageRow x add patternRowString putinterval +} for +} for +imageString +end +} dup 0 12 dict put def + +/min { +dup 3 2 roll dup 4 3 roll lt { exch } if pop +} def + +/max { +dup 3 2 roll dup 4 3 roll gt { exch } if pop +} def + +/midpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 x1 add 2 div +y0 y1 add 2 div +end +} dup 0 4 dict put def + +/thirdpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 2 mul x1 add 3 div +y0 2 mul y1 add 3 div +end +} dup 0 4 dict put def + +/subspline { +0 begin +/movetoNeeded exch def +y exch get /y3 exch def +x exch get /x3 exch def +y exch get /y2 exch def +x exch get /x2 exch def +y exch get /y1 exch def +x exch get /x1 exch def +y exch get /y0 exch def +x exch get /x0 exch def +x1 y1 x2 y2 thirdpoint +/p1y exch def +/p1x exch def +x2 y2 x1 y1 thirdpoint +/p2y exch def +/p2x exch def +x1 y1 x0 y0 thirdpoint +p1x p1y midpoint +/p0y exch def +/p0x exch def +x2 y2 x3 y3 thirdpoint +p2x p2y midpoint +/p3y exch def +/p3x exch def +movetoNeeded { p0x p0y moveto } if +p1x p1y p2x p2y p3x p3y curveto +end +} dup 0 17 dict put def + +/storexyn { +/n exch def +/y n array def +/x n array def +n 1 sub -1 0 { +/i exch def +y i 3 2 roll put +x i 3 2 roll put +} for +} def + +/SSten { +fgred fggreen fgblue setrgbcolor +dup true exch 1 0 0 -1 0 6 -1 roll matrix astore +} def + +/FSten { +dup 3 -1 roll dup 4 1 roll exch +newpath +0 0 moveto +dup 0 exch lineto +exch dup 3 1 roll exch lineto +0 lineto +closepath +bgred bggreen bgblue setrgbcolor +eofill +SSten +} def + +/Rast { +exch dup 3 1 roll 1 0 0 -1 0 6 -1 roll matrix astore +} def + +%%EndProlog + +%I Idraw 10 Grid 4.78348 4.78348 + +%%Page: 1 1 + +Begin +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u +/originalCTM matrix currentmatrix def + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 -26.69 106.362 ] concat +%I 28 +273 463 +284 465 +305 470 +367 489 +367 489 +436 512 +470 513 +531 515 +595 510 +604 508 +707 484 +743 482 +753 474 +758 438 +764 433 +753 398 +742 393 +736 386 +701 379 +444 371 +108 371 +94 370 +88 373 +85 387 +88 403 +117 429 +149 439 +253 455 +28 CBSpl +End + +Begin %I CBSpl +%I b 65535 +2 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg LtGray +0.764706 0.764706 0.764706 SetCBg +%I p +1 SetP +%I t +[ 0.987899 0 0 0.987899 -56.1179 204.16 ] concat +%I 12 +271 273 +271 273 +378 306 +378 306 +395 310 +418 311 +418 311 +494 314 +529 297 +559 276 +526 265 +259 257 +12 CBSpl +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.987899 0 0 0.987899 -56.7369 203.172 ] concat +%I 14 +100 211 +100 211 +98 195 +85 179 +84 177 +87 175 +101 175 +590 178 +626 185 +649 203 +652 241 +644 246 +644 246 +99 208 +14 CBSpl +End + +Begin %I BSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +none SetP %I p n +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat +%I 9 +42 426 +77 425 +161 429 +314 440 +462 434 +504 432 +543 432 +568 450 +579 461 +9 BSpl +%I 1 +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.246955 0.00310132 -0.00310132 0.246955 -4571.16 -1068.8 ] concat +%I 15 +18870 5610 +18869 5612 +18869 5687 +18888 5758 +18923 5810 +18970 5843 +19023 5863 +19112 5864 +19162 5842 +19205 5813 +19238 5769 +19258 5711 +19264 5657 +19259 5611 +19259 5611 +15 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.246747 0.0106122 -0.0106122 0.246747 -4141.77 -1204.88 ] concat +%I 15 +18870 5610 +18869 5612 +18869 5687 +18888 5758 +18923 5810 +18970 5843 +19023 5863 +19112 5864 +19162 5842 +19205 5813 +19238 5769 +19258 5711 +19264 5657 +19259 5611 +19259 5611 +15 CBSpl +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +0 SetP +%I t +[ 0.368358 0.000150219 -0.000150219 0.368358 154.217 313.301 ] concat +%I 14 +33 248 +50 206 +62 196 +103 195 +762 205 +779 207 +804 226 +823 264 +825 263 +844 178 +818 177 +33 167 +33 167 +30 245 +14 CBSpl +End + +Begin %I BSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 0.796717 -0 -0 0.796717 -26.69 106.362 ] concat +%I 20 +559 511 +558 514 +557 512 +557 512 +561 509 +561 509 +578 472 +581 453 +581 453 +572 413 +540 367 +534 344 +534 344 +262 341 +262 341 +264 359 +259 392 +275 446 +285 464 +288 461 +20 BSpl +%I 1 +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 0.0423222 -20.6498 ] concat + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg DkGray +0.501961 0.501961 0.501961 SetCBg +%I p +0.25 SetP +%I t +[ -0.425499 -0.104024 0.104024 -0.425499 220.603 607.984 ] concat +%I +335 397 106 106 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.21275 -0.0520125 0.0520125 -0.21275 168.881 499.063 ] concat +%I +323 366 167 167 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ -0.21275 -0.0520125 0.0520125 -0.21275 168.983 498.637 ] concat +%I +323 364 70 70 Elli +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ -0.21275 -0.0520125 0.0520125 -0.21275 168.531 498.641 ] concat +%I +328 359 382 370 Rect +End + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.192612 0.050726 -0.050726 0.192612 61.8325 311.081 ] concat +%I +370 505 418 525 Rect +End + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.178841 -0.0876834 0.0876834 0.178841 16.7249 370.947 ] concat +%I +370 505 418 525 Rect +End + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0597158 -0.190017 0.190017 0.0597158 24.7346 456.315 ] concat +%I +370 505 418 525 Rect +End + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.091501 -0.176918 0.176918 -0.091501 89.1011 507.752 ] concat +%I +370 505 418 525 Rect +End + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.188774 -0.0635361 0.0635361 -0.188774 168.921 500.062 ] concat +%I +370 505 418 525 Rect +End + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.177789 0.0897967 -0.0897967 -0.177789 222.081 436.614 ] concat +%I +370 505 418 525 Rect +End + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.052647 0.192095 -0.192095 -0.052647 211.549 348.026 ] concat +%I +370 505 418 525 Rect +End + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0842965 0.180462 -0.180462 0.0842965 154.822 303.628 ] concat +%I +370 505 418 525 Rect +End + +End %I eop + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg DkGray +0.501961 0.501961 0.501961 SetCBg +%I p +0.25 SetP +%I t +[ 0.364051 0.243593 -0.243593 0.364051 477.84 178.046 ] concat +%I +335 397 106 106 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.182026 0.121796 -0.121796 0.182026 489.089 298.094 ] concat +%I +323 366 167 167 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 0.182026 0.121796 -0.121796 0.182026 488.844 298.459 ] concat +%I +323 364 70 70 Elli +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 0.182026 0.121796 -0.121796 0.182026 489.272 298.613 ] concat +%I +328 359 382 370 Rect +End + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.197565 -0.0253094 0.0253094 0.197565 403.816 346.183 ] concat +%I +432 482 479 503 Rect +End + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.130771 -0.150237 0.150237 0.130771 391.668 425.659 ] concat +%I +432 482 479 503 Rect +End + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.0186957 -0.1983 0.1983 -0.0186957 442.088 500.283 ] concat +%I +432 482 479 503 Rect +End + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.149819 -0.13125 0.13125 -0.149819 524.114 514.833 ] concat +%I +432 482 479 503 Rect +End + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.198762 0.0128848 -0.0128849 -0.198762 596.513 467.939 ] concat +%I +432 482 479 503 Rect +End + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.138526 0.143119 -0.143119 -0.138526 613.928 389.938 ] concat +%I +432 482 479 503 Rect +End + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0304937 0.196831 -0.196831 0.0304937 558.645 303.576 ] concat +%I +432 482 479 503 Rect +End + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.154014 0.126301 -0.126301 0.154014 478.235 293.225 ] concat +%I +432 482 479 503 Rect +End + +End %I eop + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg Black +0 0 0 SetCFg +%I cbg Orange* +1 0.498039 0 SetCBg +%I f u +%I p +1 SetP +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109455 0 0 0.109455 18.1006 359.423 ] concat +%I 10 +315 513 +267 513 +267 481 +267 441 +315 441 +403 441 +443 441 +443 489 +443 513 +403 513 +10 CBSpl +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109455 0 0 0.109455 18.1006 359.861 ] concat +%I +275 449 435 497 Rect +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 -392.958 6.92719 ] concat + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0497948 -0 -0 0.0497948 537.885 423.524 ] concat +%I +355 314 685 376 Rect +End + +Begin %I Rect +none SetB %I b n +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.0400389 0 0 0.0400389 549.398 424.208 ] concat +%I +101 403 525 419 Rect +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I f u +%I p u +%I t +[ 1 0 0 1 -3.95768 -15.0728 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.19425 0 0 0.19425 -3148.29 -660.198 ] concat +%I +18301 5809 18390 5840 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.19425 0 0 0.19425 -3148.1 -660.39 ] concat +%I +18308 5810 18381 5833 Rect +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I f u +%I p +1 SetP +%I t +[ 0.984808 0.173648 -0.173648 0.984808 77.6337 -97.9683 ] concat + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109454 0 0 0.109454 523.908 397.215 ] concat +%I 10 +315 513 +267 513 +267 481 +267 441 +315 441 +403 441 +443 441 +443 489 +443 513 +403 513 +10 CBSpl +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109454 0 0 0.109454 523.908 397.649 ] concat +%I +275 449 435 497 Rect +End + +End %I eop + +Begin %I Pict +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I f u +%I p +1 SetP +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.13381 0.111318 0.111318 -0.13381 176.753 541.62 ] concat +%I 10 +248 468 +361 461 +361 484 +283 483 +383 524 +387 494 +412 500 +406 534 +405 541 +242 471 +10 Poly +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.173119 -0.0180789 0.0180789 0.173119 213.254 451.954 ] concat +%I 5 +365 499 +238 451 +243 389 +377 381 +411 453 +5 CBSpl +End + +End %I eop + +End %I eop + +showpage + +%%Trailer + +end diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/demos/car/car.3 iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/car/car.3 --- iv-3.1/iv/src/examples/edraw/demos/car/car.3 Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/car/car.3 Tue Apr 2 13:52:30 1996 @@ -0,0 +1,1052 @@ +%!PS-Adobe-2.0 EPSF-1.2 +%%Creator: idraw +%%DocumentFonts: +%%Pages: 1 +%%BoundingBox: 24 322 589 520 +%%EndComments + +%%BeginIdrawPrologue +/arrowhead { +0 begin +transform originalCTM itransform +/taily exch def +/tailx exch def +transform originalCTM itransform +/tipy exch def +/tipx exch def +/dy tipy taily sub def +/dx tipx tailx sub def +/angle dx 0 ne dy 0 ne or { dy dx atan } { 90 } ifelse def +gsave +originalCTM setmatrix +tipx tipy translate +angle rotate +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +patternNone not { +originalCTM setmatrix +/padtip arrowHeight 2 exp 0.25 arrowWidth 2 exp mul add sqrt brushWidth mul +arrowWidth div def +/padtail brushWidth 2 div def +tipx tipy translate +angle rotate +padtip 0 translate +arrowHeight padtip add padtail add arrowHeight div dup scale +arrowheadpath +ifill +} if +brushNone not { +originalCTM setmatrix +tipx tipy translate +angle rotate +arrowheadpath +istroke +} if +grestore +end +} dup 0 9 dict put def + +/arrowheadpath { +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +} def + +/leftarrow { +0 begin +y exch get /taily exch def +x exch get /tailx exch def +y exch get /tipy exch def +x exch get /tipx exch def +brushLeftArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +/rightarrow { +0 begin +y exch get /tipy exch def +x exch get /tipx exch def +y exch get /taily exch def +x exch get /tailx exch def +brushRightArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +%%EndIdrawPrologue + +/arrowHeight 10 def +/arrowWidth 5 def + +/IdrawDict 50 dict def +IdrawDict begin + +/none null def +/numGraphicParameters 17 def +/stringLimit 65535 def + +/Begin { +save +numGraphicParameters dict begin +} def + +/End { +end +restore +} def + +/SetB { +dup type /nulltype eq { +pop +false /brushRightArrow idef +false /brushLeftArrow idef +true /brushNone idef +} { +/brushDashOffset idef +/brushDashArray idef +0 ne /brushRightArrow idef +0 ne /brushLeftArrow idef +/brushWidth idef +false /brushNone idef +} ifelse +} def + +/SetCFg { +/fgblue idef +/fggreen idef +/fgred idef +} def + +/SetCBg { +/bgblue idef +/bggreen idef +/bgred idef +} def + +/SetF { +/printSize idef +/printFont idef +} def + +/SetP { +dup type /nulltype eq { +pop true /patternNone idef +} { +dup -1 eq { +/patternGrayLevel idef +/patternString idef +} { +/patternGrayLevel idef +} ifelse +false /patternNone idef +} ifelse +} def + +/BSpl { +0 begin +storexyn +newpath +n 1 gt { +0 0 0 0 0 0 1 1 true subspline +n 2 gt { +0 0 0 0 1 1 2 2 false subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 2 copy false subspline +} if +n 2 sub dup n 1 sub dup 2 copy 2 copy false subspline +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Circ { +newpath +0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/CBSpl { +0 begin +dup 2 gt { +storexyn +newpath +n 1 sub dup 0 0 1 1 2 2 true subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 0 0 false subspline +n 2 sub dup n 1 sub dup 0 0 1 1 false subspline +patternNone not { ifill } if +brushNone not { istroke } if +} { +Poly +} ifelse +end +} dup 0 4 dict put def + +/Elli { +0 begin +newpath +4 2 roll +translate +scale +0 0 1 0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 1 dict put def + +/Line { +0 begin +2 storexyn +newpath +x 0 get y 0 get moveto +x 1 get y 1 get lineto +brushNone not { istroke } if +0 0 1 1 leftarrow +0 0 1 1 rightarrow +end +} dup 0 4 dict put def + +/MLine { +0 begin +storexyn +newpath +n 1 gt { +x 0 get y 0 get moveto +1 1 n 1 sub { +/i exch def +x i get y i get lineto +} for +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Poly { +3 1 roll +newpath +moveto +-1 add +{ lineto } repeat +closepath +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/Rect { +0 begin +/t exch def +/r exch def +/b exch def +/l exch def +newpath +l b moveto +l t lineto +r t lineto +r b lineto +closepath +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 4 dict put def + +/Text { +ishow +} def + +/idef { +dup where { pop pop pop } { exch def } ifelse +} def + +/ifill { +0 begin +gsave +patternGrayLevel -1 ne { +fgred bgred fgred sub patternGrayLevel mul add +fggreen bggreen fggreen sub patternGrayLevel mul add +fgblue bgblue fgblue sub patternGrayLevel mul add setrgbcolor +eofill +} { +eoclip +originalCTM setmatrix +pathbbox /t exch def /r exch def /b exch def /l exch def +/w r l sub ceiling cvi def +/h t b sub ceiling cvi def +/imageByteWidth w 8 div ceiling cvi def +/imageHeight h def +bgred bggreen bgblue setrgbcolor +eofill +fgred fggreen fgblue setrgbcolor +w 0 gt h 0 gt and { +l w add b translate w neg h scale +w h true [w 0 0 h neg 0 h] { patternproc } imagemask +} if +} ifelse +grestore +end +} dup 0 8 dict put def + +/istroke { +gsave +brushDashOffset -1 eq { +[] 0 setdash +1 setgray +} { +brushDashArray brushDashOffset setdash +fgred fggreen fgblue setrgbcolor +} ifelse +brushWidth setlinewidth +originalCTM setmatrix +stroke +grestore +} def + +/ishow { +0 begin +gsave +fgred fggreen fgblue setrgbcolor +/fontDict printFont printSize scalefont dup setfont def +/descender fontDict begin 0 [FontBBox] 1 get FontMatrix end +transform exch pop def +/vertoffset 1 printSize sub descender sub def { +0 vertoffset moveto show +/vertoffset vertoffset printSize sub def +} forall +grestore +end +} dup 0 3 dict put def +/patternproc { +0 begin +/patternByteLength patternString length def +/patternHeight patternByteLength 8 mul sqrt cvi def +/patternWidth patternHeight def +/patternByteWidth patternWidth 8 idiv def +/imageByteMaxLength imageByteWidth imageHeight mul +stringLimit patternByteWidth sub min def +/imageMaxHeight imageByteMaxLength imageByteWidth idiv patternHeight idiv +patternHeight mul patternHeight max def +/imageHeight imageHeight imageMaxHeight sub store +/imageString imageByteWidth imageMaxHeight mul patternByteWidth add string def +0 1 imageMaxHeight 1 sub { +/y exch def +/patternRow y patternByteWidth mul patternByteLength mod def +/patternRowString patternString patternRow patternByteWidth getinterval def +/imageRow y imageByteWidth mul def +0 patternByteWidth imageByteWidth 1 sub { +/x exch def +imageString imageRow x add patternRowString putinterval +} for +} for +imageString +end +} dup 0 12 dict put def + +/min { +dup 3 2 roll dup 4 3 roll lt { exch } if pop +} def + +/max { +dup 3 2 roll dup 4 3 roll gt { exch } if pop +} def + +/midpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 x1 add 2 div +y0 y1 add 2 div +end +} dup 0 4 dict put def + +/thirdpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 2 mul x1 add 3 div +y0 2 mul y1 add 3 div +end +} dup 0 4 dict put def + +/subspline { +0 begin +/movetoNeeded exch def +y exch get /y3 exch def +x exch get /x3 exch def +y exch get /y2 exch def +x exch get /x2 exch def +y exch get /y1 exch def +x exch get /x1 exch def +y exch get /y0 exch def +x exch get /x0 exch def +x1 y1 x2 y2 thirdpoint +/p1y exch def +/p1x exch def +x2 y2 x1 y1 thirdpoint +/p2y exch def +/p2x exch def +x1 y1 x0 y0 thirdpoint +p1x p1y midpoint +/p0y exch def +/p0x exch def +x2 y2 x3 y3 thirdpoint +p2x p2y midpoint +/p3y exch def +/p3x exch def +movetoNeeded { p0x p0y moveto } if +p1x p1y p2x p2y p3x p3y curveto +end +} dup 0 17 dict put def + +/storexyn { +/n exch def +/y n array def +/x n array def +n 1 sub -1 0 { +/i exch def +y i 3 2 roll put +x i 3 2 roll put +} for +} def + +/SSten { +fgred fggreen fgblue setrgbcolor +dup true exch 1 0 0 -1 0 6 -1 roll matrix astore +} def + +/FSten { +dup 3 -1 roll dup 4 1 roll exch +newpath +0 0 moveto +dup 0 exch lineto +exch dup 3 1 roll exch lineto +0 lineto +closepath +bgred bggreen bgblue setrgbcolor +eofill +SSten +} def + +/Rast { +exch dup 3 1 roll 1 0 0 -1 0 6 -1 roll matrix astore +} def + +%%EndProlog + +%I Idraw 10 Grid 4.78348 4.78348 + +%%Page: 1 1 + +Begin +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u +/originalCTM matrix currentmatrix def + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 -26.69 106.362 ] concat +%I 28 +273 463 +284 465 +305 470 +367 489 +367 489 +436 512 +470 513 +531 515 +595 510 +604 508 +707 484 +743 482 +753 474 +758 438 +764 433 +753 398 +742 393 +736 386 +701 379 +444 371 +108 371 +94 370 +88 373 +85 387 +88 403 +117 429 +149 439 +253 455 +28 CBSpl +End + +Begin %I CBSpl +%I b 65535 +2 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg LtGray +0.764706 0.764706 0.764706 SetCBg +%I p +1 SetP +%I t +[ 0.987899 0 0 0.987899 -56.1179 204.16 ] concat +%I 12 +271 273 +271 273 +378 306 +378 306 +395 310 +418 311 +418 311 +494 314 +529 297 +559 276 +526 265 +259 257 +12 CBSpl +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.987899 0 0 0.987899 -56.7369 203.172 ] concat +%I 14 +100 211 +100 211 +98 195 +85 179 +84 177 +87 175 +101 175 +590 178 +626 185 +649 203 +652 241 +644 246 +644 246 +99 208 +14 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.246955 0.00310132 -0.00310132 0.246955 -4571.16 -1068.8 ] concat +%I 15 +18870 5610 +18869 5612 +18869 5687 +18888 5758 +18923 5810 +18970 5843 +19023 5863 +19112 5864 +19162 5842 +19205 5813 +19238 5769 +19258 5711 +19264 5657 +19259 5611 +19259 5611 +15 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.246747 0.0106122 -0.0106122 0.246747 -4141.77 -1204.88 ] concat +%I 15 +18870 5610 +18869 5612 +18869 5687 +18888 5758 +18923 5810 +18970 5843 +19023 5863 +19112 5864 +19162 5842 +19205 5813 +19238 5769 +19258 5711 +19264 5657 +19259 5611 +19259 5611 +15 CBSpl +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 0.0423222 -20.6498 ] concat + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg DkGray +0.501961 0.501961 0.501961 SetCBg +%I p +0.25 SetP +%I t +[ -0.425499 -0.104024 0.104024 -0.425499 220.603 607.984 ] concat +%I +335 397 106 106 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.21275 -0.0520125 0.0520125 -0.21275 168.881 499.063 ] concat +%I +323 366 167 167 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ -0.21275 -0.0520125 0.0520125 -0.21275 168.983 498.637 ] concat +%I +323 364 70 70 Elli +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ -0.21275 -0.0520125 0.0520125 -0.21275 168.531 498.641 ] concat +%I +328 359 382 370 Rect +End + +End %I eop + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg DkGray +0.501961 0.501961 0.501961 SetCBg +%I p +0.25 SetP +%I t +[ 0.364051 0.243593 -0.243593 0.364051 477.84 178.046 ] concat +%I +335 397 106 106 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.182026 0.121796 -0.121796 0.182026 489.089 298.094 ] concat +%I +323 366 167 167 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 0.182026 0.121796 -0.121796 0.182026 488.844 298.459 ] concat +%I +323 364 70 70 Elli +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 0.182026 0.121796 -0.121796 0.182026 489.272 298.613 ] concat +%I +328 359 382 370 Rect +End + +End %I eop + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg Black +0 0 0 SetCFg +%I cbg Orange* +1 0.498039 0 SetCBg +%I f u +%I p +1 SetP +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109455 0 0 0.109455 18.1006 359.423 ] concat +%I 10 +315 513 +267 513 +267 481 +267 441 +315 441 +403 441 +443 441 +443 489 +443 513 +403 513 +10 CBSpl +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109455 0 0 0.109455 18.1006 359.861 ] concat +%I +275 449 435 497 Rect +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 -392.958 6.92719 ] concat + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0497948 -0 -0 0.0497948 537.885 423.524 ] concat +%I +355 314 685 376 Rect +End + +Begin %I Rect +none SetB %I b n +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.0400389 0 0 0.0400389 549.398 424.208 ] concat +%I +101 403 525 419 Rect +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I f u +%I p u +%I t +[ 1 0 0 1 -3.95768 -15.0728 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.19425 0 0 0.19425 -3148.29 -660.198 ] concat +%I +18301 5809 18390 5840 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.19425 0 0 0.19425 -3148.1 -660.39 ] concat +%I +18308 5810 18381 5833 Rect +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I f u +%I p +1 SetP +%I t +[ 0.984808 0.173648 -0.173648 0.984808 77.6337 -97.9683 ] concat + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109454 0 0 0.109454 523.908 397.215 ] concat +%I 10 +315 513 +267 513 +267 481 +267 441 +315 441 +403 441 +443 441 +443 489 +443 513 +403 513 +10 CBSpl +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109454 0 0 0.109454 523.908 397.649 ] concat +%I +275 449 435 497 Rect +End + +End %I eop + +Begin %I Pict +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I f u +%I p +1 SetP +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.173119 -0.0180789 0.0180789 0.173119 213.254 451.954 ] concat +%I 5 +365 499 +238 451 +243 389 +377 381 +411 453 +5 CBSpl +End + +End %I eop + +End %I eop + +showpage + +%%Trailer + +end diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/demos/car/car.4 iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/car/car.4 --- iv-3.1/iv/src/examples/edraw/demos/car/car.4 Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/car/car.4 Tue Apr 2 13:52:30 1996 @@ -0,0 +1,976 @@ +%!PS-Adobe-2.0 EPSF-1.2 +%%Creator: idraw +%%DocumentFonts: +%%Pages: 1 +%%BoundingBox: 25 323 588 519 +%%EndComments + +%%BeginIdrawPrologue +/arrowhead { +0 begin +transform originalCTM itransform +/taily exch def +/tailx exch def +transform originalCTM itransform +/tipy exch def +/tipx exch def +/dy tipy taily sub def +/dx tipx tailx sub def +/angle dx 0 ne dy 0 ne or { dy dx atan } { 90 } ifelse def +gsave +originalCTM setmatrix +tipx tipy translate +angle rotate +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +patternNone not { +originalCTM setmatrix +/padtip arrowHeight 2 exp 0.25 arrowWidth 2 exp mul add sqrt brushWidth mul +arrowWidth div def +/padtail brushWidth 2 div def +tipx tipy translate +angle rotate +padtip 0 translate +arrowHeight padtip add padtail add arrowHeight div dup scale +arrowheadpath +ifill +} if +brushNone not { +originalCTM setmatrix +tipx tipy translate +angle rotate +arrowheadpath +istroke +} if +grestore +end +} dup 0 9 dict put def + +/arrowheadpath { +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +} def + +/leftarrow { +0 begin +y exch get /taily exch def +x exch get /tailx exch def +y exch get /tipy exch def +x exch get /tipx exch def +brushLeftArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +/rightarrow { +0 begin +y exch get /tipy exch def +x exch get /tipx exch def +y exch get /taily exch def +x exch get /tailx exch def +brushRightArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +%%EndIdrawPrologue + +/arrowHeight 10 def +/arrowWidth 5 def + +/IdrawDict 50 dict def +IdrawDict begin + +/none null def +/numGraphicParameters 17 def +/stringLimit 65535 def + +/Begin { +save +numGraphicParameters dict begin +} def + +/End { +end +restore +} def + +/SetB { +dup type /nulltype eq { +pop +false /brushRightArrow idef +false /brushLeftArrow idef +true /brushNone idef +} { +/brushDashOffset idef +/brushDashArray idef +0 ne /brushRightArrow idef +0 ne /brushLeftArrow idef +/brushWidth idef +false /brushNone idef +} ifelse +} def + +/SetCFg { +/fgblue idef +/fggreen idef +/fgred idef +} def + +/SetCBg { +/bgblue idef +/bggreen idef +/bgred idef +} def + +/SetF { +/printSize idef +/printFont idef +} def + +/SetP { +dup type /nulltype eq { +pop true /patternNone idef +} { +dup -1 eq { +/patternGrayLevel idef +/patternString idef +} { +/patternGrayLevel idef +} ifelse +false /patternNone idef +} ifelse +} def + +/BSpl { +0 begin +storexyn +newpath +n 1 gt { +0 0 0 0 0 0 1 1 true subspline +n 2 gt { +0 0 0 0 1 1 2 2 false subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 2 copy false subspline +} if +n 2 sub dup n 1 sub dup 2 copy 2 copy false subspline +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Circ { +newpath +0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/CBSpl { +0 begin +dup 2 gt { +storexyn +newpath +n 1 sub dup 0 0 1 1 2 2 true subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 0 0 false subspline +n 2 sub dup n 1 sub dup 0 0 1 1 false subspline +patternNone not { ifill } if +brushNone not { istroke } if +} { +Poly +} ifelse +end +} dup 0 4 dict put def + +/Elli { +0 begin +newpath +4 2 roll +translate +scale +0 0 1 0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 1 dict put def + +/Line { +0 begin +2 storexyn +newpath +x 0 get y 0 get moveto +x 1 get y 1 get lineto +brushNone not { istroke } if +0 0 1 1 leftarrow +0 0 1 1 rightarrow +end +} dup 0 4 dict put def + +/MLine { +0 begin +storexyn +newpath +n 1 gt { +x 0 get y 0 get moveto +1 1 n 1 sub { +/i exch def +x i get y i get lineto +} for +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Poly { +3 1 roll +newpath +moveto +-1 add +{ lineto } repeat +closepath +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/Rect { +0 begin +/t exch def +/r exch def +/b exch def +/l exch def +newpath +l b moveto +l t lineto +r t lineto +r b lineto +closepath +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 4 dict put def + +/Text { +ishow +} def + +/idef { +dup where { pop pop pop } { exch def } ifelse +} def + +/ifill { +0 begin +gsave +patternGrayLevel -1 ne { +fgred bgred fgred sub patternGrayLevel mul add +fggreen bggreen fggreen sub patternGrayLevel mul add +fgblue bgblue fgblue sub patternGrayLevel mul add setrgbcolor +eofill +} { +eoclip +originalCTM setmatrix +pathbbox /t exch def /r exch def /b exch def /l exch def +/w r l sub ceiling cvi def +/h t b sub ceiling cvi def +/imageByteWidth w 8 div ceiling cvi def +/imageHeight h def +bgred bggreen bgblue setrgbcolor +eofill +fgred fggreen fgblue setrgbcolor +w 0 gt h 0 gt and { +l w add b translate w neg h scale +w h true [w 0 0 h neg 0 h] { patternproc } imagemask +} if +} ifelse +grestore +end +} dup 0 8 dict put def + +/istroke { +gsave +brushDashOffset -1 eq { +[] 0 setdash +1 setgray +} { +brushDashArray brushDashOffset setdash +fgred fggreen fgblue setrgbcolor +} ifelse +brushWidth setlinewidth +originalCTM setmatrix +stroke +grestore +} def + +/ishow { +0 begin +gsave +fgred fggreen fgblue setrgbcolor +/fontDict printFont printSize scalefont dup setfont def +/descender fontDict begin 0 [FontBBox] 1 get FontMatrix end +transform exch pop def +/vertoffset 1 printSize sub descender sub def { +0 vertoffset moveto show +/vertoffset vertoffset printSize sub def +} forall +grestore +end +} dup 0 3 dict put def +/patternproc { +0 begin +/patternByteLength patternString length def +/patternHeight patternByteLength 8 mul sqrt cvi def +/patternWidth patternHeight def +/patternByteWidth patternWidth 8 idiv def +/imageByteMaxLength imageByteWidth imageHeight mul +stringLimit patternByteWidth sub min def +/imageMaxHeight imageByteMaxLength imageByteWidth idiv patternHeight idiv +patternHeight mul patternHeight max def +/imageHeight imageHeight imageMaxHeight sub store +/imageString imageByteWidth imageMaxHeight mul patternByteWidth add string def +0 1 imageMaxHeight 1 sub { +/y exch def +/patternRow y patternByteWidth mul patternByteLength mod def +/patternRowString patternString patternRow patternByteWidth getinterval def +/imageRow y imageByteWidth mul def +0 patternByteWidth imageByteWidth 1 sub { +/x exch def +imageString imageRow x add patternRowString putinterval +} for +} for +imageString +end +} dup 0 12 dict put def + +/min { +dup 3 2 roll dup 4 3 roll lt { exch } if pop +} def + +/max { +dup 3 2 roll dup 4 3 roll gt { exch } if pop +} def + +/midpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 x1 add 2 div +y0 y1 add 2 div +end +} dup 0 4 dict put def + +/thirdpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 2 mul x1 add 3 div +y0 2 mul y1 add 3 div +end +} dup 0 4 dict put def + +/subspline { +0 begin +/movetoNeeded exch def +y exch get /y3 exch def +x exch get /x3 exch def +y exch get /y2 exch def +x exch get /x2 exch def +y exch get /y1 exch def +x exch get /x1 exch def +y exch get /y0 exch def +x exch get /x0 exch def +x1 y1 x2 y2 thirdpoint +/p1y exch def +/p1x exch def +x2 y2 x1 y1 thirdpoint +/p2y exch def +/p2x exch def +x1 y1 x0 y0 thirdpoint +p1x p1y midpoint +/p0y exch def +/p0x exch def +x2 y2 x3 y3 thirdpoint +p2x p2y midpoint +/p3y exch def +/p3x exch def +movetoNeeded { p0x p0y moveto } if +p1x p1y p2x p2y p3x p3y curveto +end +} dup 0 17 dict put def + +/storexyn { +/n exch def +/y n array def +/x n array def +n 1 sub -1 0 { +/i exch def +y i 3 2 roll put +x i 3 2 roll put +} for +} def + +/SSten { +fgred fggreen fgblue setrgbcolor +dup true exch 1 0 0 -1 0 6 -1 roll matrix astore +} def + +/FSten { +dup 3 -1 roll dup 4 1 roll exch +newpath +0 0 moveto +dup 0 exch lineto +exch dup 3 1 roll exch lineto +0 lineto +closepath +bgred bggreen bgblue setrgbcolor +eofill +SSten +} def + +/Rast { +exch dup 3 1 roll 1 0 0 -1 0 6 -1 roll matrix astore +} def + +%%EndProlog + +%I Idraw 10 Grid 4.78348 4.78348 + +%%Page: 1 1 + +Begin +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u +/originalCTM matrix currentmatrix def + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 -26.69 106.362 ] concat +%I 28 +273 463 +284 465 +305 470 +367 489 +367 489 +436 512 +470 513 +531 515 +595 510 +604 508 +707 484 +743 482 +753 474 +758 438 +764 433 +753 398 +742 393 +736 386 +701 379 +444 371 +108 371 +94 370 +88 373 +85 387 +88 403 +117 429 +149 439 +253 455 +28 CBSpl +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.987899 0 0 0.987899 -56.7369 203.172 ] concat +%I 14 +100 211 +100 211 +98 195 +85 179 +84 177 +87 175 +101 175 +590 178 +626 185 +649 203 +652 241 +644 246 +644 246 +99 208 +14 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.246955 0.00310132 -0.00310132 0.246955 -4571.16 -1068.8 ] concat +%I 15 +18870 5610 +18869 5612 +18869 5687 +18888 5758 +18923 5810 +18970 5843 +19023 5863 +19112 5864 +19162 5842 +19205 5813 +19238 5769 +19258 5711 +19264 5657 +19259 5611 +19259 5611 +15 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.246747 0.0106122 -0.0106122 0.246747 -4141.77 -1204.88 ] concat +%I 15 +18870 5610 +18869 5612 +18869 5687 +18888 5758 +18923 5810 +18970 5843 +19023 5863 +19112 5864 +19162 5842 +19205 5813 +19238 5769 +19258 5711 +19264 5657 +19259 5611 +19259 5611 +15 CBSpl +End + +Begin %I CBSpl +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg LtGray +0.764706 0.764706 0.764706 SetCBg +%I p +1 SetP +%I t +[ 0.987899 0 0 0.987899 -56.1179 204.16 ] concat +%I 12 +271 273 +271 273 +378 306 +378 306 +395 310 +418 311 +418 311 +494 314 +529 297 +559 276 +526 265 +259 257 +12 CBSpl +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 0.0423222 -20.6498 ] concat + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg DkGray +0.501961 0.501961 0.501961 SetCBg +%I p +0.25 SetP +%I t +[ -0.425499 -0.104024 0.104024 -0.425499 220.603 607.984 ] concat +%I +335 397 106 106 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.21275 -0.0520125 0.0520125 -0.21275 168.881 499.063 ] concat +%I +323 366 167 167 Elli +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg DkGray +0.501961 0.501961 0.501961 SetCBg +%I p +0.25 SetP +%I t +[ 0.364051 0.243593 -0.243593 0.364051 477.84 178.046 ] concat +%I +335 397 106 106 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.182026 0.121796 -0.121796 0.182026 489.089 298.094 ] concat +%I +323 366 167 167 Elli +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg Black +0 0 0 SetCFg +%I cbg Orange* +1 0.498039 0 SetCBg +%I f u +%I p +1 SetP +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109455 0 0 0.109455 18.1006 359.423 ] concat +%I 10 +315 513 +267 513 +267 481 +267 441 +315 441 +403 441 +443 441 +443 489 +443 513 +403 513 +10 CBSpl +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109455 0 0 0.109455 18.1006 359.861 ] concat +%I +275 449 435 497 Rect +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 -392.958 6.92719 ] concat + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0497948 -0 -0 0.0497948 537.885 423.524 ] concat +%I +355 314 685 376 Rect +End + +Begin %I Rect +none SetB %I b n +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.0400389 0 0 0.0400389 549.398 424.208 ] concat +%I +101 403 525 419 Rect +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I f u +%I p u +%I t +[ 1 0 0 1 -3.95768 -15.0728 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.19425 0 0 0.19425 -3148.29 -660.198 ] concat +%I +18301 5809 18390 5840 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.19425 0 0 0.19425 -3148.1 -660.39 ] concat +%I +18308 5810 18381 5833 Rect +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I f u +%I p +1 SetP +%I t +[ 0.984808 0.173648 -0.173648 0.984808 77.6337 -97.9683 ] concat + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109454 0 0 0.109454 523.908 397.215 ] concat +%I 10 +315 513 +267 513 +267 481 +267 441 +315 441 +403 441 +443 441 +443 489 +443 513 +403 513 +10 CBSpl +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109454 0 0 0.109454 523.908 397.649 ] concat +%I +275 449 435 497 Rect +End + +End %I eop + +Begin %I Pict +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I f u +%I p +1 SetP +%I t +[ 1 0 0 1 0.0423222 -15.0728 ] concat + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.173119 -0.0180789 0.0180789 0.173119 213.254 451.954 ] concat +%I 5 +365 499 +238 451 +243 389 +377 381 +411 453 +5 CBSpl +End + +End %I eop + +End %I eop + +showpage + +%%Trailer + +end diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/demos/car/car.5 iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/car/car.5 --- iv-3.1/iv/src/examples/edraw/demos/car/car.5 Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/car/car.5 Tue Apr 2 13:52:30 1996 @@ -0,0 +1,936 @@ +%!PS-Adobe-2.0 EPSF-1.2 +%%Creator: idraw +%%DocumentFonts: +%%Pages: 1 +%%BoundingBox: 26 336 585 517 +%%EndComments + +%%BeginIdrawPrologue +/arrowhead { +0 begin +transform originalCTM itransform +/taily exch def +/tailx exch def +transform originalCTM itransform +/tipy exch def +/tipx exch def +/dy tipy taily sub def +/dx tipx tailx sub def +/angle dx 0 ne dy 0 ne or { dy dx atan } { 90 } ifelse def +gsave +originalCTM setmatrix +tipx tipy translate +angle rotate +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +patternNone not { +originalCTM setmatrix +/padtip arrowHeight 2 exp 0.25 arrowWidth 2 exp mul add sqrt brushWidth mul +arrowWidth div def +/padtail brushWidth 2 div def +tipx tipy translate +angle rotate +padtip 0 translate +arrowHeight padtip add padtail add arrowHeight div dup scale +arrowheadpath +ifill +} if +brushNone not { +originalCTM setmatrix +tipx tipy translate +angle rotate +arrowheadpath +istroke +} if +grestore +end +} dup 0 9 dict put def + +/arrowheadpath { +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +} def + +/leftarrow { +0 begin +y exch get /taily exch def +x exch get /tailx exch def +y exch get /tipy exch def +x exch get /tipx exch def +brushLeftArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +/rightarrow { +0 begin +y exch get /tipy exch def +x exch get /tipx exch def +y exch get /taily exch def +x exch get /tailx exch def +brushRightArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +%%EndIdrawPrologue + +/arrowHeight 10 def +/arrowWidth 5 def + +/IdrawDict 50 dict def +IdrawDict begin + +/none null def +/numGraphicParameters 17 def +/stringLimit 65535 def + +/Begin { +save +numGraphicParameters dict begin +} def + +/End { +end +restore +} def + +/SetB { +dup type /nulltype eq { +pop +false /brushRightArrow idef +false /brushLeftArrow idef +true /brushNone idef +} { +/brushDashOffset idef +/brushDashArray idef +0 ne /brushRightArrow idef +0 ne /brushLeftArrow idef +/brushWidth idef +false /brushNone idef +} ifelse +} def + +/SetCFg { +/fgblue idef +/fggreen idef +/fgred idef +} def + +/SetCBg { +/bgblue idef +/bggreen idef +/bgred idef +} def + +/SetF { +/printSize idef +/printFont idef +} def + +/SetP { +dup type /nulltype eq { +pop true /patternNone idef +} { +dup -1 eq { +/patternGrayLevel idef +/patternString idef +} { +/patternGrayLevel idef +} ifelse +false /patternNone idef +} ifelse +} def + +/BSpl { +0 begin +storexyn +newpath +n 1 gt { +0 0 0 0 0 0 1 1 true subspline +n 2 gt { +0 0 0 0 1 1 2 2 false subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 2 copy false subspline +} if +n 2 sub dup n 1 sub dup 2 copy 2 copy false subspline +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Circ { +newpath +0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/CBSpl { +0 begin +dup 2 gt { +storexyn +newpath +n 1 sub dup 0 0 1 1 2 2 true subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 0 0 false subspline +n 2 sub dup n 1 sub dup 0 0 1 1 false subspline +patternNone not { ifill } if +brushNone not { istroke } if +} { +Poly +} ifelse +end +} dup 0 4 dict put def + +/Elli { +0 begin +newpath +4 2 roll +translate +scale +0 0 1 0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 1 dict put def + +/Line { +0 begin +2 storexyn +newpath +x 0 get y 0 get moveto +x 1 get y 1 get lineto +brushNone not { istroke } if +0 0 1 1 leftarrow +0 0 1 1 rightarrow +end +} dup 0 4 dict put def + +/MLine { +0 begin +storexyn +newpath +n 1 gt { +x 0 get y 0 get moveto +1 1 n 1 sub { +/i exch def +x i get y i get lineto +} for +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Poly { +3 1 roll +newpath +moveto +-1 add +{ lineto } repeat +closepath +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/Rect { +0 begin +/t exch def +/r exch def +/b exch def +/l exch def +newpath +l b moveto +l t lineto +r t lineto +r b lineto +closepath +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 4 dict put def + +/Text { +ishow +} def + +/idef { +dup where { pop pop pop } { exch def } ifelse +} def + +/ifill { +0 begin +gsave +patternGrayLevel -1 ne { +fgred bgred fgred sub patternGrayLevel mul add +fggreen bggreen fggreen sub patternGrayLevel mul add +fgblue bgblue fgblue sub patternGrayLevel mul add setrgbcolor +eofill +} { +eoclip +originalCTM setmatrix +pathbbox /t exch def /r exch def /b exch def /l exch def +/w r l sub ceiling cvi def +/h t b sub ceiling cvi def +/imageByteWidth w 8 div ceiling cvi def +/imageHeight h def +bgred bggreen bgblue setrgbcolor +eofill +fgred fggreen fgblue setrgbcolor +w 0 gt h 0 gt and { +l w add b translate w neg h scale +w h true [w 0 0 h neg 0 h] { patternproc } imagemask +} if +} ifelse +grestore +end +} dup 0 8 dict put def + +/istroke { +gsave +brushDashOffset -1 eq { +[] 0 setdash +1 setgray +} { +brushDashArray brushDashOffset setdash +fgred fggreen fgblue setrgbcolor +} ifelse +brushWidth setlinewidth +originalCTM setmatrix +stroke +grestore +} def + +/ishow { +0 begin +gsave +fgred fggreen fgblue setrgbcolor +/fontDict printFont printSize scalefont dup setfont def +/descender fontDict begin 0 [FontBBox] 1 get FontMatrix end +transform exch pop def +/vertoffset 1 printSize sub descender sub def { +0 vertoffset moveto show +/vertoffset vertoffset printSize sub def +} forall +grestore +end +} dup 0 3 dict put def +/patternproc { +0 begin +/patternByteLength patternString length def +/patternHeight patternByteLength 8 mul sqrt cvi def +/patternWidth patternHeight def +/patternByteWidth patternWidth 8 idiv def +/imageByteMaxLength imageByteWidth imageHeight mul +stringLimit patternByteWidth sub min def +/imageMaxHeight imageByteMaxLength imageByteWidth idiv patternHeight idiv +patternHeight mul patternHeight max def +/imageHeight imageHeight imageMaxHeight sub store +/imageString imageByteWidth imageMaxHeight mul patternByteWidth add string def +0 1 imageMaxHeight 1 sub { +/y exch def +/patternRow y patternByteWidth mul patternByteLength mod def +/patternRowString patternString patternRow patternByteWidth getinterval def +/imageRow y imageByteWidth mul def +0 patternByteWidth imageByteWidth 1 sub { +/x exch def +imageString imageRow x add patternRowString putinterval +} for +} for +imageString +end +} dup 0 12 dict put def + +/min { +dup 3 2 roll dup 4 3 roll lt { exch } if pop +} def + +/max { +dup 3 2 roll dup 4 3 roll gt { exch } if pop +} def + +/midpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 x1 add 2 div +y0 y1 add 2 div +end +} dup 0 4 dict put def + +/thirdpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 2 mul x1 add 3 div +y0 2 mul y1 add 3 div +end +} dup 0 4 dict put def + +/subspline { +0 begin +/movetoNeeded exch def +y exch get /y3 exch def +x exch get /x3 exch def +y exch get /y2 exch def +x exch get /x2 exch def +y exch get /y1 exch def +x exch get /x1 exch def +y exch get /y0 exch def +x exch get /x0 exch def +x1 y1 x2 y2 thirdpoint +/p1y exch def +/p1x exch def +x2 y2 x1 y1 thirdpoint +/p2y exch def +/p2x exch def +x1 y1 x0 y0 thirdpoint +p1x p1y midpoint +/p0y exch def +/p0x exch def +x2 y2 x3 y3 thirdpoint +p2x p2y midpoint +/p3y exch def +/p3x exch def +movetoNeeded { p0x p0y moveto } if +p1x p1y p2x p2y p3x p3y curveto +end +} dup 0 17 dict put def + +/storexyn { +/n exch def +/y n array def +/x n array def +n 1 sub -1 0 { +/i exch def +y i 3 2 roll put +x i 3 2 roll put +} for +} def + +/SSten { +fgred fggreen fgblue setrgbcolor +dup true exch 1 0 0 -1 0 6 -1 roll matrix astore +} def + +/FSten { +dup 3 -1 roll dup 4 1 roll exch +newpath +0 0 moveto +dup 0 exch lineto +exch dup 3 1 roll exch lineto +0 lineto +closepath +bgred bggreen bgblue setrgbcolor +eofill +SSten +} def + +/Rast { +exch dup 3 1 roll 1 0 0 -1 0 6 -1 roll matrix astore +} def + +%%EndProlog + +%I Idraw 10 Grid 4.78348 4.78348 + +%%Page: 1 1 + +Begin +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u +/originalCTM matrix currentmatrix def + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 0 0.796722 ] concat + +Begin %I Poly +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 -39.8358 212.723 ] concat +%I 22 +84 207 +96 224 +104 244 +106 264 +132 292 +180 307 +275 324 +371 351 +466 378 +542 380 +610 377 +683 361 +755 349 +767 340 +774 313 +778 294 +784 282 +782 252 +764 226 +724 213 +553 210 +236 206 +22 Poly +End + +Begin %I Poly +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Gray80 +0.8 0.8 0.8 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 -39.8358 212.723 ] concat +%I 15 +322 329 +394 351 +457 372 +543 377 +591 373 +611 368 +642 353 +661 337 +658 329 +624 320 +494 314 +344 314 +319 316 +313 321 +316 326 +15 Poly +End + +Begin %I Poly +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.199179 -0 -0 0.199179 405.728 325.857 ] concat +%I 12 +245 274 +245 358 +275 474 +347 554 +443 588 +553 586 +643 540 +705 452 +727 366 +729 302 +661 284 +326 277 +12 Poly +End + +Begin %I Poly +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.398358 -0 -0 0.398358 -24.8974 317.093 ] concat +%I 12 +241 152 +241 189 +257 247 +293 287 +340 304 +395 302 +440 280 +471 236 +482 193 +482 152 +444 151 +282 152 +12 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 0.0423222 -19.8531 ] concat + +Begin %I Poly +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Black +0 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.199179 -0 -0 0.199179 43.2792 323.502 ] concat +%I 17 +203 554 +258 604 +339 637 +436 632 +517 596 +573 541 +608 462 +614 379 +590 302 +535 230 +446 180 +362 172 +278 197 +215 242 +173 300 +150 385 +158 478 +17 Poly +End + +Begin %I Poly +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.199179 -0 -0 0.199179 43.2792 323.502 ] concat +%I 16 +250 532 +306 573 +367 590 +431 582 +490 552 +541 499 +563 422 +554 348 +526 296 +471 246 +391 224 +316 235 +256 273 +215 332 +198 408 +216 482 +16 Poly +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.21275 -0.0520125 0.0520125 -0.21275 168.881 499.063 ] concat +%I +323 366 167 167 Elli +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 0.0423222 -14.2761 ] concat + +Begin %I Poly +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Black +0 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.199179 -0 -0 0.199179 427.22 323.488 ] concat +%I 17 +203 554 +258 604 +339 637 +436 632 +517 596 +573 541 +608 462 +614 379 +590 302 +535 230 +446 180 +362 172 +278 197 +215 242 +173 300 +150 385 +158 478 +17 Poly +End + +Begin %I Poly +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.199179 -0 -0 0.199179 427.518 322.99 ] concat +%I 16 +250 532 +306 573 +367 590 +431 582 +490 552 +541 499 +563 422 +554 348 +526 296 +471 246 +391 224 +316 235 +256 273 +215 332 +198 408 +216 482 +16 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg Black +0 0 0 SetCFg +%I cbg Orange* +1 0.498039 0 SetCBg +%I f u +%I p +1 SetP +%I t +[ 1 0 0 1 0.0423222 -14.2761 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109455 0 0 0.109455 18.1006 359.861 ] concat +%I +275 449 435 497 Rect +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 -392.958 7.72391 ] concat + +Begin %I Rect +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0497948 -0 -0 0.0497948 537.885 423.524 ] concat +%I +355 314 685 376 Rect +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 0 0.796722 ] concat + +Begin %I Pict +%I b u +%I cfg u +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I f u +%I p u +%I t +[ 1 0 0 1 -3.95768 -15.0728 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.19425 0 0 0.19425 -3148.1 -660.39 ] concat +%I +18308 5810 18381 5833 Rect +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I f u +%I p +1 SetP +%I t +[ 0.984808 0.173648 -0.173648 0.984808 77.6337 -97.1716 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.109454 0 0 0.109454 523.908 397.649 ] concat +%I +275 449 435 497 Rect +End + +End %I eop + +Begin %I Pict +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I f u +%I p +1 SetP +%I t +[ 1 0 0 1 0.0423222 -14.2761 ] concat + +Begin %I Poly +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.398358 -0 -0 0.398358 116.079 371.803 ] concat +%I 7 +370 375 +392 390 +428 394 +437 383 +433 366 +414 355 +381 359 +7 Poly +End + +End %I eop + +End %I eop + +showpage + +%%Trailer + +end diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/demos/ducks/ducks.0 iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/ducks/ducks.0 --- iv-3.1/iv/src/examples/edraw/demos/ducks/ducks.0 Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/ducks/ducks.0 Tue Apr 2 13:52:31 1996 @@ -0,0 +1,2360 @@ +%!PS-Adobe-2.0 EPSF-1.2 +%%Creator: idraw +%%DocumentFonts: +%%Pages: 1 +%%BoundingBox: 36 121 578 656 +%%EndComments + +%%BeginIdrawPrologue +/arrowhead { +0 begin +transform originalCTM itransform +/taily exch def +/tailx exch def +transform originalCTM itransform +/tipy exch def +/tipx exch def +/dy tipy taily sub def +/dx tipx tailx sub def +/angle dx 0 ne dy 0 ne or { dy dx atan } { 90 } ifelse def +gsave +originalCTM setmatrix +tipx tipy translate +angle rotate +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +patternNone not { +originalCTM setmatrix +/padtip arrowHeight 2 exp 0.25 arrowWidth 2 exp mul add sqrt brushWidth mul +arrowWidth div def +/padtail brushWidth 2 div def +tipx tipy translate +angle rotate +padtip 0 translate +arrowHeight padtip add padtail add arrowHeight div dup scale +arrowheadpath +ifill +} if +brushNone not { +originalCTM setmatrix +tipx tipy translate +angle rotate +arrowheadpath +istroke +} if +grestore +end +} dup 0 9 dict put def + +/arrowheadpath { +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +} def + +/leftarrow { +0 begin +y exch get /taily exch def +x exch get /tailx exch def +y exch get /tipy exch def +x exch get /tipx exch def +brushLeftArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +/rightarrow { +0 begin +y exch get /tipy exch def +x exch get /tipx exch def +y exch get /taily exch def +x exch get /tailx exch def +brushRightArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +%%EndIdrawPrologue + +/arrowHeight 10 def +/arrowWidth 5 def + +/IdrawDict 50 dict def +IdrawDict begin + +/none null def +/numGraphicParameters 17 def +/stringLimit 65535 def + +/Begin { +save +numGraphicParameters dict begin +} def + +/End { +end +restore +} def + +/SetB { +dup type /nulltype eq { +pop +false /brushRightArrow idef +false /brushLeftArrow idef +true /brushNone idef +} { +/brushDashOffset idef +/brushDashArray idef +0 ne /brushRightArrow idef +0 ne /brushLeftArrow idef +/brushWidth idef +false /brushNone idef +} ifelse +} def + +/SetCFg { +/fgblue idef +/fggreen idef +/fgred idef +} def + +/SetCBg { +/bgblue idef +/bggreen idef +/bgred idef +} def + +/SetF { +/printSize idef +/printFont idef +} def + +/SetP { +dup type /nulltype eq { +pop true /patternNone idef +} { +dup -1 eq { +/patternGrayLevel idef +/patternString idef +} { +/patternGrayLevel idef +} ifelse +false /patternNone idef +} ifelse +} def + +/BSpl { +0 begin +storexyn +newpath +n 1 gt { +0 0 0 0 0 0 1 1 true subspline +n 2 gt { +0 0 0 0 1 1 2 2 false subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 2 copy false subspline +} if +n 2 sub dup n 1 sub dup 2 copy 2 copy false subspline +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Circ { +newpath +0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/CBSpl { +0 begin +dup 2 gt { +storexyn +newpath +n 1 sub dup 0 0 1 1 2 2 true subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 0 0 false subspline +n 2 sub dup n 1 sub dup 0 0 1 1 false subspline +patternNone not { ifill } if +brushNone not { istroke } if +} { +Poly +} ifelse +end +} dup 0 4 dict put def + +/Elli { +0 begin +newpath +4 2 roll +translate +scale +0 0 1 0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 1 dict put def + +/Line { +0 begin +2 storexyn +newpath +x 0 get y 0 get moveto +x 1 get y 1 get lineto +brushNone not { istroke } if +0 0 1 1 leftarrow +0 0 1 1 rightarrow +end +} dup 0 4 dict put def + +/MLine { +0 begin +storexyn +newpath +n 1 gt { +x 0 get y 0 get moveto +1 1 n 1 sub { +/i exch def +x i get y i get lineto +} for +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Poly { +3 1 roll +newpath +moveto +-1 add +{ lineto } repeat +closepath +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/Rect { +0 begin +/t exch def +/r exch def +/b exch def +/l exch def +newpath +l b moveto +l t lineto +r t lineto +r b lineto +closepath +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 4 dict put def + +/Text { +ishow +} def + +/idef { +dup where { pop pop pop } { exch def } ifelse +} def + +/ifill { +0 begin +gsave +patternGrayLevel -1 ne { +fgred bgred fgred sub patternGrayLevel mul add +fggreen bggreen fggreen sub patternGrayLevel mul add +fgblue bgblue fgblue sub patternGrayLevel mul add setrgbcolor +eofill +} { +eoclip +originalCTM setmatrix +pathbbox /t exch def /r exch def /b exch def /l exch def +/w r l sub ceiling cvi def +/h t b sub ceiling cvi def +/imageByteWidth w 8 div ceiling cvi def +/imageHeight h def +bgred bggreen bgblue setrgbcolor +eofill +fgred fggreen fgblue setrgbcolor +w 0 gt h 0 gt and { +l w add b translate w neg h scale +w h true [w 0 0 h neg 0 h] { patternproc } imagemask +} if +} ifelse +grestore +end +} dup 0 8 dict put def + +/istroke { +gsave +brushDashOffset -1 eq { +[] 0 setdash +1 setgray +} { +brushDashArray brushDashOffset setdash +fgred fggreen fgblue setrgbcolor +} ifelse +brushWidth setlinewidth +originalCTM setmatrix +stroke +grestore +} def + +/ishow { +0 begin +gsave +fgred fggreen fgblue setrgbcolor +/fontDict printFont printSize scalefont dup setfont def +/descender fontDict begin 0 [FontBBox] 1 get FontMatrix end +transform exch pop def +/vertoffset 1 printSize sub descender sub def { +0 vertoffset moveto show +/vertoffset vertoffset printSize sub def +} forall +grestore +end +} dup 0 3 dict put def +/patternproc { +0 begin +/patternByteLength patternString length def +/patternHeight patternByteLength 8 mul sqrt cvi def +/patternWidth patternHeight def +/patternByteWidth patternWidth 8 idiv def +/imageByteMaxLength imageByteWidth imageHeight mul +stringLimit patternByteWidth sub min def +/imageMaxHeight imageByteMaxLength imageByteWidth idiv patternHeight idiv +patternHeight mul patternHeight max def +/imageHeight imageHeight imageMaxHeight sub store +/imageString imageByteWidth imageMaxHeight mul patternByteWidth add string def +0 1 imageMaxHeight 1 sub { +/y exch def +/patternRow y patternByteWidth mul patternByteLength mod def +/patternRowString patternString patternRow patternByteWidth getinterval def +/imageRow y imageByteWidth mul def +0 patternByteWidth imageByteWidth 1 sub { +/x exch def +imageString imageRow x add patternRowString putinterval +} for +} for +imageString +end +} dup 0 12 dict put def + +/min { +dup 3 2 roll dup 4 3 roll lt { exch } if pop +} def + +/max { +dup 3 2 roll dup 4 3 roll gt { exch } if pop +} def + +/midpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 x1 add 2 div +y0 y1 add 2 div +end +} dup 0 4 dict put def + +/thirdpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 2 mul x1 add 3 div +y0 2 mul y1 add 3 div +end +} dup 0 4 dict put def + +/subspline { +0 begin +/movetoNeeded exch def +y exch get /y3 exch def +x exch get /x3 exch def +y exch get /y2 exch def +x exch get /x2 exch def +y exch get /y1 exch def +x exch get /x1 exch def +y exch get /y0 exch def +x exch get /x0 exch def +x1 y1 x2 y2 thirdpoint +/p1y exch def +/p1x exch def +x2 y2 x1 y1 thirdpoint +/p2y exch def +/p2x exch def +x1 y1 x0 y0 thirdpoint +p1x p1y midpoint +/p0y exch def +/p0x exch def +x2 y2 x3 y3 thirdpoint +p2x p2y midpoint +/p3y exch def +/p3x exch def +movetoNeeded { p0x p0y moveto } if +p1x p1y p2x p2y p3x p3y curveto +end +} dup 0 17 dict put def + +/storexyn { +/n exch def +/y n array def +/x n array def +n 1 sub -1 0 { +/i exch def +y i 3 2 roll put +x i 3 2 roll put +} for +} def + +/SSten { +fgred fggreen fgblue setrgbcolor +dup true exch 1 0 0 -1 0 6 -1 roll matrix astore +} def + +/FSten { +dup 3 -1 roll dup 4 1 roll exch +newpath +0 0 moveto +dup 0 exch lineto +exch dup 3 1 roll exch lineto +0 lineto +closepath +bgred bggreen bgblue setrgbcolor +eofill +SSten +} def + +/Rast { +exch dup 3 1 roll 1 0 0 -1 0 6 -1 roll matrix astore +} def + +%%EndProlog + +%I Idraw 10 Grid 4.78495 4.78495 + +%%Page: 1 1 + +Begin +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u +/originalCTM matrix currentmatrix def + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Black +0 0 0 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 14 19 ] concat +%I +297 370 265 265 Elli +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Blue +0 0 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 17 21 ] concat +%I +294 368 254 254 Elli +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.569399 0.131027 0.131027 0.569399 565.989 130.981 ] concat +%I 11 +268 427 +174 403 +134 471 +120 489 +110 491 +117 450 +124 378 +157 330 +244 326 +262 348 +290 440 +11 CBSpl +End + +Begin %I Pict +%I b 65535 +3 0 0 [] 0 SetB +%I cfg u +%I cbg Orange +1 0.647059 0 SetCBg +%I f u +%I p +1 SetP +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ -0.214714 0.543398 -0.543398 -0.214714 640.775 225.736 ] concat +%I 10 +319 126 +293 135 +281 147 +258 144 +261 103 +282 78 +323 77 +349 107 +348 128 +340 134 +10 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ -0.214714 0.543398 -0.543398 -0.214714 637.729 223.904 ] concat +%I 10 +319 126 +293 135 +281 147 +258 144 +261 103 +282 78 +323 77 +349 107 +348 128 +340 134 +10 CBSpl +End + +End %I eop + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ -0.107357 0.271699 -0.271699 -0.107357 571.838 293.675 ] concat +%I 4 +291 269 +249 136 +280 134 +325 274 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ 0.583921 -0.0204753 0.0204753 0.583921 221.262 217.492 ] concat +%I 10 +319 126 +293 135 +281 147 +258 144 +261 103 +282 78 +323 77 +349 107 +348 128 +340 134 +10 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ 0.583921 -0.0204753 0.0204753 0.583921 220.802 221.016 ] concat +%I 10 +319 126 +293 135 +281 147 +258 144 +261 103 +282 78 +323 77 +349 107 +348 128 +340 134 +10 CBSpl +End + +End %I eop + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ 0.291961 -0.0102378 0.0102378 0.291961 311.098 253.512 ] concat +%I 4 +291 269 +249 136 +280 134 +325 274 +4 Poly +End + +End %I eop + +End %I eop + +Begin %I CBSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.518512 -0.117704 0.117704 0.518512 252.152 225.087 ] concat +%I 27 +266 509 +255 543 +279 578 +331 578 +352 549 +339 512 +348 480 +332 445 +370 408 +364 334 +310 257 +185 224 +108 241 +85 289 +86 365 +81 386 +65 386 +60 379 +60 379 +70 404 +95 404 +103 399 +140 361 +174 349 +225 357 +275 444 +254 480 +27 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Yellow +1 1 0 SetCBg +%I p +1 SetP +%I t +[ 0.58328 -0.0341672 0.0341672 0.58328 280.499 161.852 ] concat +%I 7 +301 576 +275 567 +269 553 +278 538 +299 537 +305 577 +305 577 +7 CBSpl +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Black +0 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.56091 -0.163595 0.163595 0.56091 190.663 166.164 ] concat +%I +311 640 7 7 Elli +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Yellow +1 1 0 SetCBg +%I p +1 SetP +%I t +[ -0.539549 0.224211 0.224211 0.539549 513.409 108.256 ] concat +%I 7 +301 576 +275 567 +269 553 +278 538 +299 537 +305 577 +305 577 +7 CBSpl +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Black +0 0 0 SetCBg +%I p +1 SetP +%I t +[ -0.575999 0.0980233 0.0980233 0.575999 596.095 72.8686 ] concat +%I +311 640 7 7 Elli +End + +Begin %I CBSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.569399 -0.131027 0.131027 0.569399 234.292 208.508 ] concat +%I 11 +268 427 +174 403 +134 471 +120 489 +110 491 +117 450 +124 378 +157 330 +244 326 +262 348 +290 440 +11 CBSpl +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 271.03 0.686005 ] concat + +Begin %I CBSpl +none SetB %I b n +%I cfg White +1 1 1 SetCFg +%I cbg MyOrange +1 0.498039 0 SetCBg +%I p +1 SetP +%I t +[ 0.701599 -0.11276 0.11276 0.701599 -80.1562 124.223 ] concat +%I 13 +295 536 +323 536 +369 521 +391 532 +391 532 +381 508 +341 507 +311 498 +281 509 +248 510 +240 537 +240 537 +265 524 +13 CBSpl +End + +Begin %I BSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg LtGray +0.764706 0.764706 0.764706 SetCBg +none SetP %I p n +%I t u +%I 5 +149 473 +164 456 +197 452 +235 442 +254 453 +5 BSpl +%I 1 +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b 65535 +3 0 0 [] 0 SetB +%I cfg u +%I cbg Orange +1 0.647059 0 SetCBg +%I f u +%I p +1 SetP +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ -0.214714 0.543398 -0.543398 -0.214714 503.62 225.617 ] concat +%I 10 +319 126 +293 135 +281 147 +258 144 +261 103 +282 78 +323 77 +349 107 +348 128 +340 134 +10 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ -0.214714 0.543398 -0.543398 -0.214714 500.574 223.785 ] concat +%I 10 +319 126 +293 135 +281 147 +258 144 +261 103 +282 78 +323 77 +349 107 +348 128 +340 134 +10 CBSpl +End + +End %I eop + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ -0.107357 0.271699 -0.271699 -0.107357 434.683 293.556 ] concat +%I 4 +291 269 +249 136 +280 134 +325 274 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ 0.583921 -0.0204753 0.0204753 0.583921 84.107 217.372 ] concat +%I 10 +319 126 +293 135 +281 147 +258 144 +261 103 +282 78 +323 77 +349 107 +348 128 +340 134 +10 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ 0.583921 -0.0204753 0.0204753 0.583921 83.6461 220.896 ] concat +%I 10 +319 126 +293 135 +281 147 +258 144 +261 103 +282 78 +323 77 +349 107 +348 128 +340 134 +10 CBSpl +End + +End %I eop + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ 0.291961 -0.0102377 0.0102377 0.291961 173.943 253.393 ] concat +%I 4 +291 269 +249 136 +280 134 +325 274 +4 Poly +End + +End %I eop + +End %I eop + +Begin %I Elli +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.0709675 -0.0568061 0.0568061 0.0709675 334.014 473.36 ] concat +%I +163 235 129 129 Elli +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +1 SetP +%I t +[ 0.0746452 -0.0518788 0.0518788 0.0746452 333.866 470.724 ] concat +%I 22 +109 337 +144 348 +176 348 +205 342 +226 330 +244 314 +248 303 +243 299 +234 296 +228 296 +223 297 +214 308 +200 317 +183 324 +158 327 +140 320 +121 316 +112 316 +108 320 +105 325 +103 332 +104 335 +22 CBSpl +End + +Begin %I Elli +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 332.982 510.994 ] concat +%I +376 486 176 176 Elli +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 332.528 510.648 ] concat +%I 16 +377 659 +352 657 +317 648 +277 626 +255 609 +229 575 +211 534 +206 487 +259 486 +260 525 +270 555 +293 582 +321 605 +369 616 +397 615 +397 659 +16 CBSpl +End + +Begin %I Elli +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 343.65 520.969 ] concat +%I +376 486 176 176 Elli +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 343.196 520.623 ] concat +%I 16 +377 659 +352 657 +317 648 +277 626 +255 609 +229 575 +211 534 +206 487 +259 486 +260 525 +270 555 +293 582 +321 605 +369 616 +397 615 +397 659 +16 CBSpl +End + +Begin %I Elli +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 345.031 510.219 ] concat +%I +376 486 176 176 Elli +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 344.577 509.873 ] concat +%I 16 +377 659 +352 657 +317 648 +277 626 +255 609 +229 575 +211 534 +206 487 +259 486 +260 525 +270 555 +293 582 +321 605 +369 616 +397 615 +397 659 +16 CBSpl +End + +Begin %I Elli +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 360.325 492.913 ] concat +%I +376 486 176 176 Elli +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 359.871 492.567 ] concat +%I 16 +377 659 +352 657 +317 648 +277 626 +255 609 +229 575 +211 534 +206 487 +259 486 +260 525 +270 555 +293 582 +321 605 +369 616 +397 615 +397 659 +16 CBSpl +End + +Begin %I Elli +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.0709675 -0.0568061 0.0568061 0.0709675 273.826 518.924 ] concat +%I +163 235 129 129 Elli +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +1 SetP +%I t +[ 0.0746452 -0.0518788 0.0518788 0.0746452 273.677 516.289 ] concat +%I 22 +109 337 +144 348 +176 348 +205 342 +226 330 +244 314 +248 303 +243 299 +234 296 +228 296 +223 297 +214 308 +200 317 +183 324 +158 327 +140 320 +121 316 +112 316 +108 320 +105 325 +103 332 +104 335 +22 CBSpl +End + +Begin %I Elli +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.0709675 -0.0568061 0.0568061 0.0709675 267.37 489.159 ] concat +%I +163 235 129 129 Elli +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +1 SetP +%I t +[ 0.0746452 -0.0518788 0.0518788 0.0746452 267.222 486.523 ] concat +%I 22 +109 337 +144 348 +176 348 +205 342 +226 330 +244 314 +248 303 +243 299 +234 296 +228 296 +223 297 +214 308 +200 317 +183 324 +158 327 +140 320 +121 316 +112 316 +108 320 +105 325 +103 332 +104 335 +22 CBSpl +End + +Begin %I Elli +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 262.195 524.345 ] concat +%I +376 486 176 176 Elli +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 261.74 523.999 ] concat +%I 16 +377 659 +352 657 +317 648 +277 626 +255 609 +229 575 +211 534 +206 487 +259 486 +260 525 +270 555 +293 582 +321 605 +369 616 +397 615 +397 659 +16 CBSpl +End + +Begin %I Elli +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 288.511 519.216 ] concat +%I +376 486 176 176 Elli +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 288.057 518.87 ] concat +%I 16 +377 659 +352 657 +317 648 +277 626 +255 609 +229 575 +211 534 +206 487 +259 486 +260 525 +270 555 +293 582 +321 605 +369 616 +397 615 +397 659 +16 CBSpl +End + +Begin %I Elli +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 269.917 498.349 ] concat +%I +376 486 176 176 Elli +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 269.463 498.003 ] concat +%I 16 +377 659 +352 657 +317 648 +277 626 +255 609 +229 575 +211 534 +206 487 +259 486 +260 525 +270 555 +293 582 +321 605 +369 616 +397 615 +397 659 +16 CBSpl +End + +Begin %I Elli +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 240.817 510.864 ] concat +%I +376 486 176 176 Elli +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 240.362 510.518 ] concat +%I 16 +377 659 +352 657 +317 648 +277 626 +255 609 +229 575 +211 534 +206 487 +259 486 +260 525 +270 555 +293 582 +321 605 +369 616 +397 615 +397 659 +16 CBSpl +End + +Begin %I Elli +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 258.072 536.011 ] concat +%I +376 486 176 176 Elli +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 257.618 535.666 ] concat +%I 16 +377 659 +352 657 +317 648 +277 626 +255 609 +229 575 +211 534 +206 487 +259 486 +260 525 +270 555 +293 582 +321 605 +369 616 +397 615 +397 659 +16 CBSpl +End + +Begin %I Elli +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 254.472 524.803 ] concat +%I +376 486 176 176 Elli +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 254.018 524.458 ] concat +%I 16 +377 659 +352 657 +317 648 +277 626 +255 609 +229 575 +211 534 +206 487 +259 486 +260 525 +270 555 +293 582 +321 605 +369 616 +397 615 +397 659 +16 CBSpl +End + +Begin %I Elli +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 269.102 548.659 ] concat +%I +376 486 176 176 Elli +End + +Begin %I CBSpl +none SetB %I b n +%I cfg Black +0 0 0 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +1 SetP +%I t +[ -0.00047828 -0.0320485 0.0320485 -0.00047828 268.648 548.313 ] concat +%I 16 +377 659 +352 657 +317 648 +277 626 +255 609 +229 575 +211 534 +206 487 +259 486 +260 525 +270 555 +293 582 +321 605 +369 616 +397 615 +397 659 +16 CBSpl +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b 65535 +3 0 0 [] 0 SetB +%I cfg u +%I cbg Brown +0.647059 0.164706 0.164706 SetCBg +%I f u +%I p +1 SetP +%I t u + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.8125 SetP +%I t +[ 0.411377 -0.0946634 0.0946634 0.411377 124.032 466.936 ] concat +%I 4 +444 380 +433 329 +476 330 +465 378 +4 Poly +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.8125 SetP +%I t +[ 0.411377 -0.0946634 0.0946634 0.411377 124.032 466.936 ] concat +%I 5 +451 364 +422 357 +427 437 +481 427 +485 381 +5 CBSpl +End + +End %I eop + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Brown +0.647059 0.164706 0.164706 SetCBg +%I p +1 SetP +%I t +[ 0.863891 -0.198793 0.198793 0.863891 -117.457 342.03 ] concat +%I +443 348 439 315 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Brown +0.647059 0.164706 0.164706 SetCBg +%I p +1 SetP +%I t +[ -0.863891 0.198793 0.198793 0.863891 660.823 164.237 ] concat +%I +443 348 439 315 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Brown +0.647059 0.164706 0.164706 SetCBg +%I p +1 SetP +%I t +[ 0.863891 -0.198793 0.198793 0.863891 -117.83 338.997 ] concat +%I +449 342 448 305 Line +%I 1 +End + +End %I eop + +Begin %I CBSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Green +0 1 0 SetCBg +%I p +1 SetP +%I t +[ 0.792414 -0.182345 0.182345 0.792414 -73.0214 282.968 ] concat +%I 14 +396 370 +420 362 +444 370 +444 314 +444 266 +476 266 +476 202 +476 130 +412 130 +356 130 +356 202 +356 266 +396 266 +396 314 +14 CBSpl +End + +Begin %I CBSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +1 SetP +%I t +[ -0.569399 0.131027 0.131027 0.569399 534.435 213.281 ] concat +%I 8 +502 234 +443 217 +376 239 +376 167 +378 91 +445 101 +499 90 +505 169 +8 CBSpl +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.569399 0.131027 0.131027 0.569399 294.959 130.295 ] concat +%I 11 +268 427 +174 403 +134 471 +120 489 +110 491 +117 450 +124 378 +157 330 +244 326 +262 348 +290 440 +11 CBSpl +End + +Begin %I Pict +%I b 65535 +3 0 0 [] 0 SetB +%I cfg u +%I cbg Orange +1 0.647059 0 SetCBg +%I f u +%I p +1 SetP +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ -0.214714 0.543398 -0.543398 -0.214714 369.745 225.05 ] concat +%I 10 +319 126 +293 135 +281 147 +258 144 +261 103 +282 78 +323 77 +349 107 +348 128 +340 134 +10 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ -0.214714 0.543398 -0.543398 -0.214714 366.699 223.218 ] concat +%I 10 +319 126 +293 135 +281 147 +258 144 +261 103 +282 78 +323 77 +349 107 +348 128 +340 134 +10 CBSpl +End + +End %I eop + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ -0.107357 0.271699 -0.271699 -0.107357 300.808 292.989 ] concat +%I 4 +291 269 +249 136 +280 134 +325 274 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ 0.583921 -0.0204753 0.0204753 0.583921 -49.7679 216.806 ] concat +%I 10 +319 126 +293 135 +281 147 +258 144 +261 103 +282 78 +323 77 +349 107 +348 128 +340 134 +10 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ 0.583921 -0.0204753 0.0204753 0.583921 -50.2286 220.33 ] concat +%I 10 +319 126 +293 135 +281 147 +258 144 +261 103 +282 78 +323 77 +349 107 +348 128 +340 134 +10 CBSpl +End + +End %I eop + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ 0.291961 -0.0102378 0.0102378 0.291961 40.0681 252.826 ] concat +%I 4 +291 269 +249 136 +280 134 +325 274 +4 Poly +End + +End %I eop + +End %I eop + +Begin %I CBSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.518512 -0.117704 0.117704 0.518512 -18.8782 224.401 ] concat +%I 27 +266 509 +255 543 +279 578 +331 578 +352 549 +339 512 +348 480 +332 445 +370 408 +364 334 +310 257 +185 224 +108 241 +85 289 +86 365 +81 386 +65 386 +60 379 +60 379 +70 404 +95 404 +103 399 +140 361 +174 349 +225 357 +275 444 +254 480 +27 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Yellow +1 1 0 SetCBg +%I p +1 SetP +%I t +[ 0.58328 -0.0341672 0.0341672 0.58328 9.46893 161.166 ] concat +%I 7 +301 576 +275 567 +269 553 +278 538 +299 537 +305 577 +305 577 +7 CBSpl +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Black +0 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.56091 -0.163595 0.163595 0.56091 -80.3676 165.478 ] concat +%I +311 640 7 7 Elli +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Yellow +1 1 0 SetCBg +%I p +1 SetP +%I t +[ -0.539549 0.224211 0.224211 0.539549 242.379 107.57 ] concat +%I 7 +301 576 +275 567 +269 553 +278 538 +299 537 +305 577 +305 577 +7 CBSpl +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Black +0 0 0 SetCBg +%I p +1 SetP +%I t +[ -0.575999 0.0980233 0.0980233 0.575999 325.065 72.1826 ] concat +%I +311 640 7 7 Elli +End + +Begin %I CBSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.569399 -0.131027 0.131027 0.569399 -36.7385 207.822 ] concat +%I 11 +268 427 +174 403 +134 471 +120 489 +110 491 +117 450 +124 378 +157 330 +244 326 +262 348 +290 440 +11 CBSpl +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +none SetB %I b n +%I cfg White +1 1 1 SetCFg +%I cbg MyOrange +1 0.498039 0 SetCBg +%I p +1 SetP +%I t +[ 0.701599 -0.11276 0.11276 0.701599 -80.1562 124.223 ] concat +%I 13 +295 536 +323 536 +369 521 +391 532 +391 532 +381 508 +341 507 +311 498 +281 509 +248 510 +240 537 +240 537 +265 524 +13 CBSpl +End + +Begin %I BSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg LtGray +0.764706 0.764706 0.764706 SetCBg +none SetP %I p n +%I t u +%I 5 +149 473 +164 456 +197 452 +235 442 +254 453 +5 BSpl +%I 1 +End + +End %I eop + +End %I eop + +End %I eop + +showpage + +%%Trailer + +end diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/demos/ducks/ducks.1 iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/ducks/ducks.1 --- iv-3.1/iv/src/examples/edraw/demos/ducks/ducks.1 Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/ducks/ducks.1 Tue Apr 2 13:52:31 1996 @@ -0,0 +1,1561 @@ +%!PS-Adobe-2.0 EPSF-1.2 +%%Creator: idraw +%%DocumentFonts: +%%Pages: 1 +%%BoundingBox: 36 132 570 645 +%%EndComments + +%%BeginIdrawPrologue +/arrowhead { +0 begin +transform originalCTM itransform +/taily exch def +/tailx exch def +transform originalCTM itransform +/tipy exch def +/tipx exch def +/dy tipy taily sub def +/dx tipx tailx sub def +/angle dx 0 ne dy 0 ne or { dy dx atan } { 90 } ifelse def +gsave +originalCTM setmatrix +tipx tipy translate +angle rotate +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +patternNone not { +originalCTM setmatrix +/padtip arrowHeight 2 exp 0.25 arrowWidth 2 exp mul add sqrt brushWidth mul +arrowWidth div def +/padtail brushWidth 2 div def +tipx tipy translate +angle rotate +padtip 0 translate +arrowHeight padtip add padtail add arrowHeight div dup scale +arrowheadpath +ifill +} if +brushNone not { +originalCTM setmatrix +tipx tipy translate +angle rotate +arrowheadpath +istroke +} if +grestore +end +} dup 0 9 dict put def + +/arrowheadpath { +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +} def + +/leftarrow { +0 begin +y exch get /taily exch def +x exch get /tailx exch def +y exch get /tipy exch def +x exch get /tipx exch def +brushLeftArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +/rightarrow { +0 begin +y exch get /tipy exch def +x exch get /tipx exch def +y exch get /taily exch def +x exch get /tailx exch def +brushRightArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +%%EndIdrawPrologue + +/arrowHeight 10 def +/arrowWidth 5 def + +/IdrawDict 50 dict def +IdrawDict begin + +/none null def +/numGraphicParameters 17 def +/stringLimit 65535 def + +/Begin { +save +numGraphicParameters dict begin +} def + +/End { +end +restore +} def + +/SetB { +dup type /nulltype eq { +pop +false /brushRightArrow idef +false /brushLeftArrow idef +true /brushNone idef +} { +/brushDashOffset idef +/brushDashArray idef +0 ne /brushRightArrow idef +0 ne /brushLeftArrow idef +/brushWidth idef +false /brushNone idef +} ifelse +} def + +/SetCFg { +/fgblue idef +/fggreen idef +/fgred idef +} def + +/SetCBg { +/bgblue idef +/bggreen idef +/bgred idef +} def + +/SetF { +/printSize idef +/printFont idef +} def + +/SetP { +dup type /nulltype eq { +pop true /patternNone idef +} { +dup -1 eq { +/patternGrayLevel idef +/patternString idef +} { +/patternGrayLevel idef +} ifelse +false /patternNone idef +} ifelse +} def + +/BSpl { +0 begin +storexyn +newpath +n 1 gt { +0 0 0 0 0 0 1 1 true subspline +n 2 gt { +0 0 0 0 1 1 2 2 false subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 2 copy false subspline +} if +n 2 sub dup n 1 sub dup 2 copy 2 copy false subspline +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Circ { +newpath +0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/CBSpl { +0 begin +dup 2 gt { +storexyn +newpath +n 1 sub dup 0 0 1 1 2 2 true subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 0 0 false subspline +n 2 sub dup n 1 sub dup 0 0 1 1 false subspline +patternNone not { ifill } if +brushNone not { istroke } if +} { +Poly +} ifelse +end +} dup 0 4 dict put def + +/Elli { +0 begin +newpath +4 2 roll +translate +scale +0 0 1 0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 1 dict put def + +/Line { +0 begin +2 storexyn +newpath +x 0 get y 0 get moveto +x 1 get y 1 get lineto +brushNone not { istroke } if +0 0 1 1 leftarrow +0 0 1 1 rightarrow +end +} dup 0 4 dict put def + +/MLine { +0 begin +storexyn +newpath +n 1 gt { +x 0 get y 0 get moveto +1 1 n 1 sub { +/i exch def +x i get y i get lineto +} for +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Poly { +3 1 roll +newpath +moveto +-1 add +{ lineto } repeat +closepath +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/Rect { +0 begin +/t exch def +/r exch def +/b exch def +/l exch def +newpath +l b moveto +l t lineto +r t lineto +r b lineto +closepath +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 4 dict put def + +/Text { +ishow +} def + +/idef { +dup where { pop pop pop } { exch def } ifelse +} def + +/ifill { +0 begin +gsave +patternGrayLevel -1 ne { +fgred bgred fgred sub patternGrayLevel mul add +fggreen bggreen fggreen sub patternGrayLevel mul add +fgblue bgblue fgblue sub patternGrayLevel mul add setrgbcolor +eofill +} { +eoclip +originalCTM setmatrix +pathbbox /t exch def /r exch def /b exch def /l exch def +/w r l sub ceiling cvi def +/h t b sub ceiling cvi def +/imageByteWidth w 8 div ceiling cvi def +/imageHeight h def +bgred bggreen bgblue setrgbcolor +eofill +fgred fggreen fgblue setrgbcolor +w 0 gt h 0 gt and { +l w add b translate w neg h scale +w h true [w 0 0 h neg 0 h] { patternproc } imagemask +} if +} ifelse +grestore +end +} dup 0 8 dict put def + +/istroke { +gsave +brushDashOffset -1 eq { +[] 0 setdash +1 setgray +} { +brushDashArray brushDashOffset setdash +fgred fggreen fgblue setrgbcolor +} ifelse +brushWidth setlinewidth +originalCTM setmatrix +stroke +grestore +} def + +/ishow { +0 begin +gsave +fgred fggreen fgblue setrgbcolor +/fontDict printFont printSize scalefont dup setfont def +/descender fontDict begin 0 [FontBBox] 1 get FontMatrix end +transform exch pop def +/vertoffset 1 printSize sub descender sub def { +0 vertoffset moveto show +/vertoffset vertoffset printSize sub def +} forall +grestore +end +} dup 0 3 dict put def +/patternproc { +0 begin +/patternByteLength patternString length def +/patternHeight patternByteLength 8 mul sqrt cvi def +/patternWidth patternHeight def +/patternByteWidth patternWidth 8 idiv def +/imageByteMaxLength imageByteWidth imageHeight mul +stringLimit patternByteWidth sub min def +/imageMaxHeight imageByteMaxLength imageByteWidth idiv patternHeight idiv +patternHeight mul patternHeight max def +/imageHeight imageHeight imageMaxHeight sub store +/imageString imageByteWidth imageMaxHeight mul patternByteWidth add string def +0 1 imageMaxHeight 1 sub { +/y exch def +/patternRow y patternByteWidth mul patternByteLength mod def +/patternRowString patternString patternRow patternByteWidth getinterval def +/imageRow y imageByteWidth mul def +0 patternByteWidth imageByteWidth 1 sub { +/x exch def +imageString imageRow x add patternRowString putinterval +} for +} for +imageString +end +} dup 0 12 dict put def + +/min { +dup 3 2 roll dup 4 3 roll lt { exch } if pop +} def + +/max { +dup 3 2 roll dup 4 3 roll gt { exch } if pop +} def + +/midpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 x1 add 2 div +y0 y1 add 2 div +end +} dup 0 4 dict put def + +/thirdpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 2 mul x1 add 3 div +y0 2 mul y1 add 3 div +end +} dup 0 4 dict put def + +/subspline { +0 begin +/movetoNeeded exch def +y exch get /y3 exch def +x exch get /x3 exch def +y exch get /y2 exch def +x exch get /x2 exch def +y exch get /y1 exch def +x exch get /x1 exch def +y exch get /y0 exch def +x exch get /x0 exch def +x1 y1 x2 y2 thirdpoint +/p1y exch def +/p1x exch def +x2 y2 x1 y1 thirdpoint +/p2y exch def +/p2x exch def +x1 y1 x0 y0 thirdpoint +p1x p1y midpoint +/p0y exch def +/p0x exch def +x2 y2 x3 y3 thirdpoint +p2x p2y midpoint +/p3y exch def +/p3x exch def +movetoNeeded { p0x p0y moveto } if +p1x p1y p2x p2y p3x p3y curveto +end +} dup 0 17 dict put def + +/storexyn { +/n exch def +/y n array def +/x n array def +n 1 sub -1 0 { +/i exch def +y i 3 2 roll put +x i 3 2 roll put +} for +} def + +/SSten { +fgred fggreen fgblue setrgbcolor +dup true exch 1 0 0 -1 0 6 -1 roll matrix astore +} def + +/FSten { +dup 3 -1 roll dup 4 1 roll exch +newpath +0 0 moveto +dup 0 exch lineto +exch dup 3 1 roll exch lineto +0 lineto +closepath +bgred bggreen bgblue setrgbcolor +eofill +SSten +} def + +/Rast { +exch dup 3 1 roll 1 0 0 -1 0 6 -1 roll matrix astore +} def + +%%EndProlog + +%I Idraw 10 Grid 4.78495 4.78495 + +%%Page: 1 1 + +Begin +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u +/originalCTM matrix currentmatrix def + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Elli +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Blue +0 0 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 17 21 ] concat +%I +294 368 254 254 Elli +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.569399 0.131027 0.131027 0.569399 565.989 130.981 ] concat +%I 11 +268 427 +174 403 +134 471 +120 489 +110 491 +117 450 +124 378 +157 330 +244 326 +262 348 +290 440 +11 CBSpl +End + +Begin %I Pict +%I b 65535 +3 0 0 [] 0 SetB +%I cfg u +%I cbg Orange +1 0.647059 0 SetCBg +%I f u +%I p +1 SetP +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ -0.214714 0.543398 -0.543398 -0.214714 637.729 223.904 ] concat +%I 10 +319 126 +293 135 +281 147 +258 144 +261 103 +282 78 +323 77 +349 107 +348 128 +340 134 +10 CBSpl +End + +End %I eop + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ -0.107357 0.271699 -0.271699 -0.107357 571.838 293.675 ] concat +%I 4 +291 269 +249 136 +280 134 +325 274 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ 0.583921 -0.0204753 0.0204753 0.583921 220.802 221.016 ] concat +%I 10 +319 126 +293 135 +281 147 +258 144 +261 103 +282 78 +323 77 +349 107 +348 128 +340 134 +10 CBSpl +End + +End %I eop + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ 0.291961 -0.0102378 0.0102378 0.291961 311.098 253.512 ] concat +%I 4 +291 269 +249 136 +280 134 +325 274 +4 Poly +End + +End %I eop + +End %I eop + +Begin %I CBSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.518512 -0.117704 0.117704 0.518512 252.152 225.087 ] concat +%I 27 +266 509 +255 543 +279 578 +331 578 +352 549 +339 512 +348 480 +332 445 +370 408 +364 334 +310 257 +185 224 +108 241 +85 289 +86 365 +81 386 +65 386 +60 379 +60 379 +70 404 +95 404 +103 399 +140 361 +174 349 +225 357 +275 444 +254 480 +27 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Yellow +1 1 0 SetCBg +%I p +1 SetP +%I t +[ 0.58328 -0.0341672 0.0341672 0.58328 280.499 161.852 ] concat +%I 7 +301 576 +275 567 +269 553 +278 538 +299 537 +305 577 +305 577 +7 CBSpl +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Black +0 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.56091 -0.163595 0.163595 0.56091 190.663 166.164 ] concat +%I +311 640 7 7 Elli +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Yellow +1 1 0 SetCBg +%I p +1 SetP +%I t +[ -0.539549 0.224211 0.224211 0.539549 513.409 108.256 ] concat +%I 7 +301 576 +275 567 +269 553 +278 538 +299 537 +305 577 +305 577 +7 CBSpl +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Black +0 0 0 SetCBg +%I p +1 SetP +%I t +[ -0.575999 0.0980233 0.0980233 0.575999 596.095 72.8686 ] concat +%I +311 640 7 7 Elli +End + +Begin %I CBSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.569399 -0.131027 0.131027 0.569399 234.292 208.508 ] concat +%I 11 +268 427 +174 403 +134 471 +120 489 +110 491 +117 450 +124 378 +157 330 +244 326 +262 348 +290 440 +11 CBSpl +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 271.03 0.686005 ] concat + +Begin %I CBSpl +none SetB %I b n +%I cfg White +1 1 1 SetCFg +%I cbg MyOrange +1 0.498039 0 SetCBg +%I p +1 SetP +%I t +[ 0.701599 -0.11276 0.11276 0.701599 -80.1562 124.223 ] concat +%I 13 +295 536 +323 536 +369 521 +391 532 +391 532 +381 508 +341 507 +311 498 +281 509 +248 510 +240 537 +240 537 +265 524 +13 CBSpl +End + +Begin %I BSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg LtGray +0.764706 0.764706 0.764706 SetCBg +none SetP %I p n +%I t u +%I 5 +149 473 +164 456 +197 452 +235 442 +254 453 +5 BSpl +%I 1 +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b 65535 +3 0 0 [] 0 SetB +%I cfg u +%I cbg Orange +1 0.647059 0 SetCBg +%I f u +%I p +1 SetP +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ -0.214714 0.543398 -0.543398 -0.214714 500.574 223.785 ] concat +%I 10 +319 126 +293 135 +281 147 +258 144 +261 103 +282 78 +323 77 +349 107 +348 128 +340 134 +10 CBSpl +End + +End %I eop + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ -0.107357 0.271699 -0.271699 -0.107357 434.683 293.556 ] concat +%I 4 +291 269 +249 136 +280 134 +325 274 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ 0.583921 -0.0204753 0.0204753 0.583921 83.6461 220.896 ] concat +%I 10 +319 126 +293 135 +281 147 +258 144 +261 103 +282 78 +323 77 +349 107 +348 128 +340 134 +10 CBSpl +End + +End %I eop + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ 0.291961 -0.0102377 0.0102377 0.291961 173.943 253.393 ] concat +%I 4 +291 269 +249 136 +280 134 +325 274 +4 Poly +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b 65535 +3 0 0 [] 0 SetB +%I cfg u +%I cbg Brown +0.647059 0.164706 0.164706 SetCBg +%I f u +%I p +1 SetP +%I t u + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.8125 SetP +%I t +[ 0.411377 -0.0946634 0.0946634 0.411377 124.032 466.936 ] concat +%I 4 +444 380 +433 329 +476 330 +465 378 +4 Poly +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.8125 SetP +%I t +[ 0.411377 -0.0946634 0.0946634 0.411377 124.032 466.936 ] concat +%I 5 +451 364 +422 357 +427 437 +481 427 +485 381 +5 CBSpl +End + +End %I eop + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Brown +0.647059 0.164706 0.164706 SetCBg +%I p +1 SetP +%I t +[ 0.863891 -0.198793 0.198793 0.863891 -117.457 342.03 ] concat +%I +443 348 439 315 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Brown +0.647059 0.164706 0.164706 SetCBg +%I p +1 SetP +%I t +[ -0.863891 0.198793 0.198793 0.863891 660.823 164.237 ] concat +%I +443 348 439 315 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Brown +0.647059 0.164706 0.164706 SetCBg +%I p +1 SetP +%I t +[ 0.863891 -0.198793 0.198793 0.863891 -117.83 338.997 ] concat +%I +449 342 448 305 Line +%I 1 +End + +End %I eop + +Begin %I CBSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Green +0 1 0 SetCBg +%I p +1 SetP +%I t +[ 0.792414 -0.182345 0.182345 0.792414 -73.0214 282.968 ] concat +%I 14 +396 370 +420 362 +444 370 +444 314 +444 266 +476 266 +476 202 +476 130 +412 130 +356 130 +356 202 +356 266 +396 266 +396 314 +14 CBSpl +End + +Begin %I CBSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Gray +0.745098 0.745098 0.745098 SetCBg +%I p +1 SetP +%I t +[ -0.569399 0.131027 0.131027 0.569399 534.435 213.281 ] concat +%I 8 +502 234 +443 217 +376 239 +376 167 +378 91 +445 101 +499 90 +505 169 +8 CBSpl +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ -0.569399 0.131027 0.131027 0.569399 294.959 130.295 ] concat +%I 11 +268 427 +174 403 +134 471 +120 489 +110 491 +117 450 +124 378 +157 330 +244 326 +262 348 +290 440 +11 CBSpl +End + +Begin %I Pict +%I b 65535 +3 0 0 [] 0 SetB +%I cfg u +%I cbg Orange +1 0.647059 0 SetCBg +%I f u +%I p +1 SetP +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ -0.214714 0.543398 -0.543398 -0.214714 366.699 223.218 ] concat +%I 10 +319 126 +293 135 +281 147 +258 144 +261 103 +282 78 +323 77 +349 107 +348 128 +340 134 +10 CBSpl +End + +End %I eop + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ -0.107357 0.271699 -0.271699 -0.107357 300.808 292.989 ] concat +%I 4 +291 269 +249 136 +280 134 +325 274 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ 0.583921 -0.0204753 0.0204753 0.583921 -50.2286 220.33 ] concat +%I 10 +319 126 +293 135 +281 147 +258 144 +261 103 +282 78 +323 77 +349 107 +348 128 +340 134 +10 CBSpl +End + +End %I eop + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.625 SetP +%I t +[ 0.291961 -0.0102378 0.0102378 0.291961 40.0681 252.826 ] concat +%I 4 +291 269 +249 136 +280 134 +325 274 +4 Poly +End + +End %I eop + +End %I eop + +Begin %I CBSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.518512 -0.117704 0.117704 0.518512 -18.8782 224.401 ] concat +%I 27 +266 509 +255 543 +279 578 +331 578 +352 549 +339 512 +348 480 +332 445 +370 408 +364 334 +310 257 +185 224 +108 241 +85 289 +86 365 +81 386 +65 386 +60 379 +60 379 +70 404 +95 404 +103 399 +140 361 +174 349 +225 357 +275 444 +254 480 +27 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Yellow +1 1 0 SetCBg +%I p +1 SetP +%I t +[ 0.58328 -0.0341672 0.0341672 0.58328 9.46893 161.166 ] concat +%I 7 +301 576 +275 567 +269 553 +278 538 +299 537 +305 577 +305 577 +7 CBSpl +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Black +0 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.56091 -0.163595 0.163595 0.56091 -80.3676 165.478 ] concat +%I +311 640 7 7 Elli +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Yellow +1 1 0 SetCBg +%I p +1 SetP +%I t +[ -0.539549 0.224211 0.224211 0.539549 242.379 107.57 ] concat +%I 7 +301 576 +275 567 +269 553 +278 538 +299 537 +305 577 +305 577 +7 CBSpl +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Black +0 0 0 SetCBg +%I p +1 SetP +%I t +[ -0.575999 0.0980233 0.0980233 0.575999 325.065 72.1826 ] concat +%I +311 640 7 7 Elli +End + +Begin %I CBSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.569399 -0.131027 0.131027 0.569399 -36.7385 207.822 ] concat +%I 11 +268 427 +174 403 +134 471 +120 489 +110 491 +117 450 +124 378 +157 330 +244 326 +262 348 +290 440 +11 CBSpl +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +none SetB %I b n +%I cfg White +1 1 1 SetCFg +%I cbg MyOrange +1 0.498039 0 SetCBg +%I p +1 SetP +%I t +[ 0.701599 -0.11276 0.11276 0.701599 -80.1562 124.223 ] concat +%I 13 +295 536 +323 536 +369 521 +391 532 +391 532 +381 508 +341 507 +311 498 +281 509 +248 510 +240 537 +240 537 +265 524 +13 CBSpl +End + +Begin %I BSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg LtGray +0.764706 0.764706 0.764706 SetCBg +none SetP %I p n +%I t u +%I 5 +149 473 +164 456 +197 452 +235 442 +254 453 +5 BSpl +%I 1 +End + +End %I eop + +End %I eop + +End %I eop + +showpage + +%%Trailer + +end diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/demos/ducks/ducks.2 iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/ducks/ducks.2 --- iv-3.1/iv/src/examples/edraw/demos/ducks/ducks.2 Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/ducks/ducks.2 Tue Apr 2 13:52:31 1996 @@ -0,0 +1,1327 @@ +%!PS-Adobe-2.0 EPSF-1.2 +%%Creator: idraw +%%DocumentFonts: +%%Pages: 1 +%%BoundingBox: 54 132 566 647 +%%EndComments + +%%BeginIdrawPrologue +/arrowhead { +0 begin +transform originalCTM itransform +/taily exch def +/tailx exch def +transform originalCTM itransform +/tipy exch def +/tipx exch def +/dy tipy taily sub def +/dx tipx tailx sub def +/angle dx 0 ne dy 0 ne or { dy dx atan } { 90 } ifelse def +gsave +originalCTM setmatrix +tipx tipy translate +angle rotate +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +patternNone not { +originalCTM setmatrix +/padtip arrowHeight 2 exp 0.25 arrowWidth 2 exp mul add sqrt brushWidth mul +arrowWidth div def +/padtail brushWidth 2 div def +tipx tipy translate +angle rotate +padtip 0 translate +arrowHeight padtip add padtail add arrowHeight div dup scale +arrowheadpath +ifill +} if +brushNone not { +originalCTM setmatrix +tipx tipy translate +angle rotate +arrowheadpath +istroke +} if +grestore +end +} dup 0 9 dict put def + +/arrowheadpath { +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +} def + +/leftarrow { +0 begin +y exch get /taily exch def +x exch get /tailx exch def +y exch get /tipy exch def +x exch get /tipx exch def +brushLeftArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +/rightarrow { +0 begin +y exch get /tipy exch def +x exch get /tipx exch def +y exch get /taily exch def +x exch get /tailx exch def +brushRightArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +%%EndIdrawPrologue + +/arrowHeight 10 def +/arrowWidth 5 def + +/IdrawDict 50 dict def +IdrawDict begin + +/none null def +/numGraphicParameters 17 def +/stringLimit 65535 def + +/Begin { +save +numGraphicParameters dict begin +} def + +/End { +end +restore +} def + +/SetB { +dup type /nulltype eq { +pop +false /brushRightArrow idef +false /brushLeftArrow idef +true /brushNone idef +} { +/brushDashOffset idef +/brushDashArray idef +0 ne /brushRightArrow idef +0 ne /brushLeftArrow idef +/brushWidth idef +false /brushNone idef +} ifelse +} def + +/SetCFg { +/fgblue idef +/fggreen idef +/fgred idef +} def + +/SetCBg { +/bgblue idef +/bggreen idef +/bgred idef +} def + +/SetF { +/printSize idef +/printFont idef +} def + +/SetP { +dup type /nulltype eq { +pop true /patternNone idef +} { +dup -1 eq { +/patternGrayLevel idef +/patternString idef +} { +/patternGrayLevel idef +} ifelse +false /patternNone idef +} ifelse +} def + +/BSpl { +0 begin +storexyn +newpath +n 1 gt { +0 0 0 0 0 0 1 1 true subspline +n 2 gt { +0 0 0 0 1 1 2 2 false subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 2 copy false subspline +} if +n 2 sub dup n 1 sub dup 2 copy 2 copy false subspline +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Circ { +newpath +0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/CBSpl { +0 begin +dup 2 gt { +storexyn +newpath +n 1 sub dup 0 0 1 1 2 2 true subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 0 0 false subspline +n 2 sub dup n 1 sub dup 0 0 1 1 false subspline +patternNone not { ifill } if +brushNone not { istroke } if +} { +Poly +} ifelse +end +} dup 0 4 dict put def + +/Elli { +0 begin +newpath +4 2 roll +translate +scale +0 0 1 0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 1 dict put def + +/Line { +0 begin +2 storexyn +newpath +x 0 get y 0 get moveto +x 1 get y 1 get lineto +brushNone not { istroke } if +0 0 1 1 leftarrow +0 0 1 1 rightarrow +end +} dup 0 4 dict put def + +/MLine { +0 begin +storexyn +newpath +n 1 gt { +x 0 get y 0 get moveto +1 1 n 1 sub { +/i exch def +x i get y i get lineto +} for +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Poly { +3 1 roll +newpath +moveto +-1 add +{ lineto } repeat +closepath +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/Rect { +0 begin +/t exch def +/r exch def +/b exch def +/l exch def +newpath +l b moveto +l t lineto +r t lineto +r b lineto +closepath +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 4 dict put def + +/Text { +ishow +} def + +/idef { +dup where { pop pop pop } { exch def } ifelse +} def + +/ifill { +0 begin +gsave +patternGrayLevel -1 ne { +fgred bgred fgred sub patternGrayLevel mul add +fggreen bggreen fggreen sub patternGrayLevel mul add +fgblue bgblue fgblue sub patternGrayLevel mul add setrgbcolor +eofill +} { +eoclip +originalCTM setmatrix +pathbbox /t exch def /r exch def /b exch def /l exch def +/w r l sub ceiling cvi def +/h t b sub ceiling cvi def +/imageByteWidth w 8 div ceiling cvi def +/imageHeight h def +bgred bggreen bgblue setrgbcolor +eofill +fgred fggreen fgblue setrgbcolor +w 0 gt h 0 gt and { +l w add b translate w neg h scale +w h true [w 0 0 h neg 0 h] { patternproc } imagemask +} if +} ifelse +grestore +end +} dup 0 8 dict put def + +/istroke { +gsave +brushDashOffset -1 eq { +[] 0 setdash +1 setgray +} { +brushDashArray brushDashOffset setdash +fgred fggreen fgblue setrgbcolor +} ifelse +brushWidth setlinewidth +originalCTM setmatrix +stroke +grestore +} def + +/ishow { +0 begin +gsave +fgred fggreen fgblue setrgbcolor +/fontDict printFont printSize scalefont dup setfont def +/descender fontDict begin 0 [FontBBox] 1 get FontMatrix end +transform exch pop def +/vertoffset 1 printSize sub descender sub def { +0 vertoffset moveto show +/vertoffset vertoffset printSize sub def +} forall +grestore +end +} dup 0 3 dict put def +/patternproc { +0 begin +/patternByteLength patternString length def +/patternHeight patternByteLength 8 mul sqrt cvi def +/patternWidth patternHeight def +/patternByteWidth patternWidth 8 idiv def +/imageByteMaxLength imageByteWidth imageHeight mul +stringLimit patternByteWidth sub min def +/imageMaxHeight imageByteMaxLength imageByteWidth idiv patternHeight idiv +patternHeight mul patternHeight max def +/imageHeight imageHeight imageMaxHeight sub store +/imageString imageByteWidth imageMaxHeight mul patternByteWidth add string def +0 1 imageMaxHeight 1 sub { +/y exch def +/patternRow y patternByteWidth mul patternByteLength mod def +/patternRowString patternString patternRow patternByteWidth getinterval def +/imageRow y imageByteWidth mul def +0 patternByteWidth imageByteWidth 1 sub { +/x exch def +imageString imageRow x add patternRowString putinterval +} for +} for +imageString +end +} dup 0 12 dict put def + +/min { +dup 3 2 roll dup 4 3 roll lt { exch } if pop +} def + +/max { +dup 3 2 roll dup 4 3 roll gt { exch } if pop +} def + +/midpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 x1 add 2 div +y0 y1 add 2 div +end +} dup 0 4 dict put def + +/thirdpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 2 mul x1 add 3 div +y0 2 mul y1 add 3 div +end +} dup 0 4 dict put def + +/subspline { +0 begin +/movetoNeeded exch def +y exch get /y3 exch def +x exch get /x3 exch def +y exch get /y2 exch def +x exch get /x2 exch def +y exch get /y1 exch def +x exch get /x1 exch def +y exch get /y0 exch def +x exch get /x0 exch def +x1 y1 x2 y2 thirdpoint +/p1y exch def +/p1x exch def +x2 y2 x1 y1 thirdpoint +/p2y exch def +/p2x exch def +x1 y1 x0 y0 thirdpoint +p1x p1y midpoint +/p0y exch def +/p0x exch def +x2 y2 x3 y3 thirdpoint +p2x p2y midpoint +/p3y exch def +/p3x exch def +movetoNeeded { p0x p0y moveto } if +p1x p1y p2x p2y p3x p3y curveto +end +} dup 0 17 dict put def + +/storexyn { +/n exch def +/y n array def +/x n array def +n 1 sub -1 0 { +/i exch def +y i 3 2 roll put +x i 3 2 roll put +} for +} def + +/SSten { +fgred fggreen fgblue setrgbcolor +dup true exch 1 0 0 -1 0 6 -1 roll matrix astore +} def + +/FSten { +dup 3 -1 roll dup 4 1 roll exch +newpath +0 0 moveto +dup 0 exch lineto +exch dup 3 1 roll exch lineto +0 lineto +closepath +bgred bggreen bgblue setrgbcolor +eofill +SSten +} def + +/Rast { +exch dup 3 1 roll 1 0 0 -1 0 6 -1 roll matrix astore +} def + +%%EndProlog + +%I Idraw 10 Grid 4.78495 4.78495 + +%%Page: 1 1 + +Begin +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u +/originalCTM matrix currentmatrix def + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Blue +0 0 1 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 4.7803 82.0619 ] concat +%I 16 +383 706 +503 682 +597 621 +681 502 +701 378 +670 245 +594 147 +499 89 +394 67 +257 95 +153 167 +91 263 +67 377 +86 490 +153 601 +253 677 +16 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 275.664 82.0619 ] concat +%I 10 +234 414 +294 389 +309 389 +362 431 +335 350 +311 329 +277 328 +253 336 +238 346 +231 384 +10 Poly +End + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 275.664 82.0619 ] concat +%I 28 +66 417 +78 418 +79 399 +70 350 +81 323 +116 305 +170 301 +225 316 +252 344 +264 377 +261 410 +257 422 +266 443 +272 474 +276 490 +269 505 +244 511 +227 504 +218 486 +210 452 +206 422 +192 392 +170 383 +142 388 +108 405 +94 425 +78 429 +72 425 +28 Poly +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Yellow +1 1 0 SetCBg +%I p +1 SetP +%I t +[ 0.58328 -0.0341672 0.0341672 0.58328 280.353 161.166 ] concat +%I 7 +301 576 +275 567 +269 553 +278 538 +299 537 +305 577 +305 577 +7 CBSpl +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Black +0 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.56091 -0.163595 0.163595 0.56091 190.516 165.478 ] concat +%I +311 640 7 7 Elli +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Yellow +1 1 0 SetCBg +%I p +1 SetP +%I t +[ -0.539549 0.224211 0.224211 0.539549 513.263 107.57 ] concat +%I 7 +301 576 +275 567 +269 553 +278 538 +299 537 +305 577 +305 577 +7 CBSpl +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Black +0 0 0 SetCBg +%I p +1 SetP +%I t +[ -0.575999 0.0980233 0.0980233 0.575999 595.949 72.1826 ] concat +%I +311 640 7 7 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 270.884 0 ] concat + +Begin %I CBSpl +none SetB %I b n +%I cfg White +1 1 1 SetCFg +%I cbg MyOrange +1 0.498039 0 SetCBg +%I p +1 SetP +%I t +[ 0.701599 -0.11276 0.11276 0.701599 -80.1562 124.223 ] concat +%I 13 +295 536 +323 536 +369 521 +391 532 +391 532 +381 508 +341 507 +311 498 +281 509 +248 510 +240 537 +240 537 +265 524 +13 CBSpl +End + +Begin %I BSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg LtGray +0.764706 0.764706 0.764706 SetCBg +none SetP %I p n +%I t u +%I 5 +149 473 +164 456 +197 452 +235 442 +254 453 +5 BSpl +%I 1 +End + +End %I eop + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 275.664 82.0619 ] concat +%I 11 +112 491 +127 452 +149 426 +181 420 +220 421 +185 359 +170 356 +131 366 +108 389 +102 414 +103 444 +11 Poly +End + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Orange +1 0.647059 0 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 275.664 82.0619 ] concat +%I 13 +155 310 +169 312 +151 266 +167 260 +183 262 +189 255 +183 239 +166 226 +151 223 +131 236 +125 257 +129 272 +140 274 +13 Poly +End + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Orange +1 0.647059 0 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 275.664 82.0619 ] concat +%I 12 +235 339 +242 327 +278 330 +290 320 +303 324 +323 346 +314 371 +299 381 +276 382 +271 374 +278 364 +282 342 +12 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Green +0 1 0 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 4.7803 82.0619 ] concat +%I 18 +297 335 +314 416 +325 427 +352 435 +360 445 +377 511 +388 523 +421 514 +425 505 +410 428 +417 415 +429 402 +429 365 +409 299 +393 287 +373 284 +307 299 +296 313 +18 Poly +End + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Gray70 +0.701961 0.701961 0.701961 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 4.7803 82.0619 ] concat +%I 12 +330 343 +341 396 +352 405 +376 400 +424 390 +430 375 +424 344 +413 313 +400 302 +381 303 +338 314 +329 326 +12 Poly +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b 65535 +3 0 0 [] 0 SetB +%I cfg u +%I cbg Brown +0.647059 0.164706 0.164706 SetCBg +%I f u +%I p +1 SetP +%I t u + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.8125 SetP +%I t +[ 0.411377 -0.0946634 0.0946634 0.411377 124.032 466.936 ] concat +%I 4 +444 380 +433 329 +476 330 +465 378 +4 Poly +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.8125 SetP +%I t +[ 0.411377 -0.0946634 0.0946634 0.411377 124.032 466.936 ] concat +%I 5 +451 364 +422 357 +427 437 +481 427 +485 381 +5 CBSpl +End + +End %I eop + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Brown +0.647059 0.164706 0.164706 SetCBg +%I p +1 SetP +%I t +[ 0.863891 -0.198793 0.198793 0.863891 -117.457 342.03 ] concat +%I +443 348 439 315 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Brown +0.647059 0.164706 0.164706 SetCBg +%I p +1 SetP +%I t +[ -0.863891 0.198793 0.198793 0.863891 660.823 164.237 ] concat +%I +443 348 439 315 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Brown +0.647059 0.164706 0.164706 SetCBg +%I p +1 SetP +%I t +[ 0.863891 -0.198793 0.198793 0.863891 -117.83 338.997 ] concat +%I +449 342 448 305 Line +%I 1 +End + +End %I eop + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Orange +1 0.647059 0 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 138.629 82.0619 ] concat +%I 13 +155 310 +169 312 +151 266 +167 260 +183 262 +189 255 +183 239 +166 226 +151 223 +131 236 +125 257 +129 272 +140 274 +13 Poly +End + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Orange +1 0.647059 0 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 138.629 82.0619 ] concat +%I 12 +235 339 +242 327 +278 330 +290 320 +303 324 +323 346 +314 371 +299 381 +276 382 +271 374 +278 364 +282 342 +12 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 4.7803 82.0619 ] concat +%I 10 +234 414 +294 389 +309 389 +362 431 +335 350 +311 329 +277 328 +253 336 +238 346 +231 384 +10 Poly +End + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 4.7803 82.0619 ] concat +%I 28 +66 417 +78 418 +79 399 +70 350 +81 323 +116 305 +170 301 +225 316 +252 344 +264 377 +261 410 +257 422 +266 443 +272 474 +276 490 +269 505 +244 511 +227 504 +218 486 +210 452 +206 422 +192 392 +170 383 +142 388 +108 405 +94 425 +78 429 +72 425 +28 Poly +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Yellow +1 1 0 SetCBg +%I p +1 SetP +%I t +[ 0.58328 -0.0341672 0.0341672 0.58328 9.46893 161.166 ] concat +%I 7 +301 576 +275 567 +269 553 +278 538 +299 537 +305 577 +305 577 +7 CBSpl +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Black +0 0 0 SetCBg +%I p +1 SetP +%I t +[ 0.56091 -0.163595 0.163595 0.56091 -80.3676 165.478 ] concat +%I +311 640 7 7 Elli +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Yellow +1 1 0 SetCBg +%I p +1 SetP +%I t +[ -0.539549 0.224211 0.224211 0.539549 242.379 107.57 ] concat +%I 7 +301 576 +275 567 +269 553 +278 538 +299 537 +305 577 +305 577 +7 CBSpl +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Black +0 0 0 SetCBg +%I p +1 SetP +%I t +[ -0.575999 0.0980233 0.0980233 0.575999 325.065 72.1826 ] concat +%I +311 640 7 7 Elli +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +none SetB %I b n +%I cfg White +1 1 1 SetCFg +%I cbg MyOrange +1 0.498039 0 SetCBg +%I p +1 SetP +%I t +[ 0.701599 -0.11276 0.11276 0.701599 -80.1562 124.223 ] concat +%I 13 +295 536 +323 536 +369 521 +391 532 +391 532 +381 508 +341 507 +311 498 +281 509 +248 510 +240 537 +240 537 +265 524 +13 CBSpl +End + +Begin %I BSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg LtGray +0.764706 0.764706 0.764706 SetCBg +none SetP %I p n +%I t u +%I 5 +149 473 +164 456 +197 452 +235 442 +254 453 +5 BSpl +%I 1 +End + +End %I eop + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 4.7803 82.0619 ] concat +%I 11 +112 491 +127 452 +149 426 +181 420 +220 421 +185 359 +170 356 +131 366 +108 389 +102 414 +103 444 +11 Poly +End + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Orange +1 0.647059 0 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 4.7803 82.0619 ] concat +%I 13 +155 310 +169 312 +151 266 +167 260 +183 262 +189 255 +183 239 +166 226 +151 223 +131 236 +125 257 +129 272 +140 274 +13 Poly +End + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Orange +1 0.647059 0 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 4.7803 82.0619 ] concat +%I 12 +235 339 +242 327 +278 330 +290 320 +303 324 +323 346 +314 371 +299 381 +276 382 +271 374 +278 364 +282 342 +12 Poly +End + +End %I eop + +End %I eop + +showpage + +%%Trailer + +end diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/demos/ducks/ducks.3 iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/ducks/ducks.3 --- iv-3.1/iv/src/examples/edraw/demos/ducks/ducks.3 Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/ducks/ducks.3 Tue Apr 2 13:52:31 1996 @@ -0,0 +1,904 @@ +%!PS-Adobe-2.0 EPSF-1.2 +%%Creator: idraw +%%DocumentFonts: +%%Pages: 1 +%%BoundingBox: 54 132 566 647 +%%EndComments + +%%BeginIdrawPrologue +/arrowhead { +0 begin +transform originalCTM itransform +/taily exch def +/tailx exch def +transform originalCTM itransform +/tipy exch def +/tipx exch def +/dy tipy taily sub def +/dx tipx tailx sub def +/angle dx 0 ne dy 0 ne or { dy dx atan } { 90 } ifelse def +gsave +originalCTM setmatrix +tipx tipy translate +angle rotate +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +patternNone not { +originalCTM setmatrix +/padtip arrowHeight 2 exp 0.25 arrowWidth 2 exp mul add sqrt brushWidth mul +arrowWidth div def +/padtail brushWidth 2 div def +tipx tipy translate +angle rotate +padtip 0 translate +arrowHeight padtip add padtail add arrowHeight div dup scale +arrowheadpath +ifill +} if +brushNone not { +originalCTM setmatrix +tipx tipy translate +angle rotate +arrowheadpath +istroke +} if +grestore +end +} dup 0 9 dict put def + +/arrowheadpath { +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +} def + +/leftarrow { +0 begin +y exch get /taily exch def +x exch get /tailx exch def +y exch get /tipy exch def +x exch get /tipx exch def +brushLeftArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +/rightarrow { +0 begin +y exch get /tipy exch def +x exch get /tipx exch def +y exch get /taily exch def +x exch get /tailx exch def +brushRightArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +%%EndIdrawPrologue + +/arrowHeight 10 def +/arrowWidth 5 def + +/IdrawDict 50 dict def +IdrawDict begin + +/none null def +/numGraphicParameters 17 def +/stringLimit 65535 def + +/Begin { +save +numGraphicParameters dict begin +} def + +/End { +end +restore +} def + +/SetB { +dup type /nulltype eq { +pop +false /brushRightArrow idef +false /brushLeftArrow idef +true /brushNone idef +} { +/brushDashOffset idef +/brushDashArray idef +0 ne /brushRightArrow idef +0 ne /brushLeftArrow idef +/brushWidth idef +false /brushNone idef +} ifelse +} def + +/SetCFg { +/fgblue idef +/fggreen idef +/fgred idef +} def + +/SetCBg { +/bgblue idef +/bggreen idef +/bgred idef +} def + +/SetF { +/printSize idef +/printFont idef +} def + +/SetP { +dup type /nulltype eq { +pop true /patternNone idef +} { +dup -1 eq { +/patternGrayLevel idef +/patternString idef +} { +/patternGrayLevel idef +} ifelse +false /patternNone idef +} ifelse +} def + +/BSpl { +0 begin +storexyn +newpath +n 1 gt { +0 0 0 0 0 0 1 1 true subspline +n 2 gt { +0 0 0 0 1 1 2 2 false subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 2 copy false subspline +} if +n 2 sub dup n 1 sub dup 2 copy 2 copy false subspline +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Circ { +newpath +0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/CBSpl { +0 begin +dup 2 gt { +storexyn +newpath +n 1 sub dup 0 0 1 1 2 2 true subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 0 0 false subspline +n 2 sub dup n 1 sub dup 0 0 1 1 false subspline +patternNone not { ifill } if +brushNone not { istroke } if +} { +Poly +} ifelse +end +} dup 0 4 dict put def + +/Elli { +0 begin +newpath +4 2 roll +translate +scale +0 0 1 0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 1 dict put def + +/Line { +0 begin +2 storexyn +newpath +x 0 get y 0 get moveto +x 1 get y 1 get lineto +brushNone not { istroke } if +0 0 1 1 leftarrow +0 0 1 1 rightarrow +end +} dup 0 4 dict put def + +/MLine { +0 begin +storexyn +newpath +n 1 gt { +x 0 get y 0 get moveto +1 1 n 1 sub { +/i exch def +x i get y i get lineto +} for +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Poly { +3 1 roll +newpath +moveto +-1 add +{ lineto } repeat +closepath +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/Rect { +0 begin +/t exch def +/r exch def +/b exch def +/l exch def +newpath +l b moveto +l t lineto +r t lineto +r b lineto +closepath +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 4 dict put def + +/Text { +ishow +} def + +/idef { +dup where { pop pop pop } { exch def } ifelse +} def + +/ifill { +0 begin +gsave +patternGrayLevel -1 ne { +fgred bgred fgred sub patternGrayLevel mul add +fggreen bggreen fggreen sub patternGrayLevel mul add +fgblue bgblue fgblue sub patternGrayLevel mul add setrgbcolor +eofill +} { +eoclip +originalCTM setmatrix +pathbbox /t exch def /r exch def /b exch def /l exch def +/w r l sub ceiling cvi def +/h t b sub ceiling cvi def +/imageByteWidth w 8 div ceiling cvi def +/imageHeight h def +bgred bggreen bgblue setrgbcolor +eofill +fgred fggreen fgblue setrgbcolor +w 0 gt h 0 gt and { +l w add b translate w neg h scale +w h true [w 0 0 h neg 0 h] { patternproc } imagemask +} if +} ifelse +grestore +end +} dup 0 8 dict put def + +/istroke { +gsave +brushDashOffset -1 eq { +[] 0 setdash +1 setgray +} { +brushDashArray brushDashOffset setdash +fgred fggreen fgblue setrgbcolor +} ifelse +brushWidth setlinewidth +originalCTM setmatrix +stroke +grestore +} def + +/ishow { +0 begin +gsave +fgred fggreen fgblue setrgbcolor +/fontDict printFont printSize scalefont dup setfont def +/descender fontDict begin 0 [FontBBox] 1 get FontMatrix end +transform exch pop def +/vertoffset 1 printSize sub descender sub def { +0 vertoffset moveto show +/vertoffset vertoffset printSize sub def +} forall +grestore +end +} dup 0 3 dict put def +/patternproc { +0 begin +/patternByteLength patternString length def +/patternHeight patternByteLength 8 mul sqrt cvi def +/patternWidth patternHeight def +/patternByteWidth patternWidth 8 idiv def +/imageByteMaxLength imageByteWidth imageHeight mul +stringLimit patternByteWidth sub min def +/imageMaxHeight imageByteMaxLength imageByteWidth idiv patternHeight idiv +patternHeight mul patternHeight max def +/imageHeight imageHeight imageMaxHeight sub store +/imageString imageByteWidth imageMaxHeight mul patternByteWidth add string def +0 1 imageMaxHeight 1 sub { +/y exch def +/patternRow y patternByteWidth mul patternByteLength mod def +/patternRowString patternString patternRow patternByteWidth getinterval def +/imageRow y imageByteWidth mul def +0 patternByteWidth imageByteWidth 1 sub { +/x exch def +imageString imageRow x add patternRowString putinterval +} for +} for +imageString +end +} dup 0 12 dict put def + +/min { +dup 3 2 roll dup 4 3 roll lt { exch } if pop +} def + +/max { +dup 3 2 roll dup 4 3 roll gt { exch } if pop +} def + +/midpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 x1 add 2 div +y0 y1 add 2 div +end +} dup 0 4 dict put def + +/thirdpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 2 mul x1 add 3 div +y0 2 mul y1 add 3 div +end +} dup 0 4 dict put def + +/subspline { +0 begin +/movetoNeeded exch def +y exch get /y3 exch def +x exch get /x3 exch def +y exch get /y2 exch def +x exch get /x2 exch def +y exch get /y1 exch def +x exch get /x1 exch def +y exch get /y0 exch def +x exch get /x0 exch def +x1 y1 x2 y2 thirdpoint +/p1y exch def +/p1x exch def +x2 y2 x1 y1 thirdpoint +/p2y exch def +/p2x exch def +x1 y1 x0 y0 thirdpoint +p1x p1y midpoint +/p0y exch def +/p0x exch def +x2 y2 x3 y3 thirdpoint +p2x p2y midpoint +/p3y exch def +/p3x exch def +movetoNeeded { p0x p0y moveto } if +p1x p1y p2x p2y p3x p3y curveto +end +} dup 0 17 dict put def + +/storexyn { +/n exch def +/y n array def +/x n array def +n 1 sub -1 0 { +/i exch def +y i 3 2 roll put +x i 3 2 roll put +} for +} def + +/SSten { +fgred fggreen fgblue setrgbcolor +dup true exch 1 0 0 -1 0 6 -1 roll matrix astore +} def + +/FSten { +dup 3 -1 roll dup 4 1 roll exch +newpath +0 0 moveto +dup 0 exch lineto +exch dup 3 1 roll exch lineto +0 lineto +closepath +bgred bggreen bgblue setrgbcolor +eofill +SSten +} def + +/Rast { +exch dup 3 1 roll 1 0 0 -1 0 6 -1 roll matrix astore +} def + +%%EndProlog + +%I Idraw 10 Grid 4.78495 4.78495 + +%%Page: 1 1 + +Begin +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u +/originalCTM matrix currentmatrix def + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Blue +0 0 1 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 4.7803 82.0619 ] concat +%I 16 +383 706 +503 682 +597 621 +681 502 +701 378 +670 245 +594 147 +499 89 +394 67 +257 95 +153 167 +91 263 +67 377 +86 490 +153 601 +253 677 +16 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 275.664 82.0619 ] concat +%I 10 +234 414 +294 389 +309 389 +362 431 +335 350 +311 329 +277 328 +253 336 +238 346 +231 384 +10 Poly +End + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 275.664 82.0619 ] concat +%I 28 +66 417 +78 418 +79 399 +70 350 +81 323 +116 305 +170 301 +225 316 +252 344 +264 377 +261 410 +257 422 +266 443 +272 474 +276 490 +269 505 +244 511 +227 504 +218 486 +210 452 +206 422 +192 392 +170 383 +142 388 +108 405 +94 425 +78 429 +72 425 +28 Poly +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 270.884 0 ] concat + +Begin %I CBSpl +none SetB %I b n +%I cfg White +1 1 1 SetCFg +%I cbg MyOrange +1 0.498039 0 SetCBg +%I p +1 SetP +%I t +[ 0.701599 -0.11276 0.11276 0.701599 -80.1562 124.223 ] concat +%I 13 +295 536 +323 536 +369 521 +391 532 +391 532 +381 508 +341 507 +311 498 +281 509 +248 510 +240 537 +240 537 +265 524 +13 CBSpl +End + +Begin %I BSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg LtGray +0.764706 0.764706 0.764706 SetCBg +none SetP %I p n +%I t u +%I 5 +149 473 +164 456 +197 452 +235 442 +254 453 +5 BSpl +%I 1 +End + +End %I eop + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 275.664 82.0619 ] concat +%I 11 +112 491 +127 452 +149 426 +181 420 +220 421 +185 359 +170 356 +131 366 +108 389 +102 414 +103 444 +11 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Green +0 1 0 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 4.7803 82.0619 ] concat +%I 18 +297 335 +314 416 +325 427 +352 435 +360 445 +377 511 +388 523 +421 514 +425 505 +410 428 +417 415 +429 402 +429 365 +409 299 +393 287 +373 284 +307 299 +296 313 +18 Poly +End + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg Gray70 +0.701961 0.701961 0.701961 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 4.7803 82.0619 ] concat +%I 12 +330 343 +341 396 +352 405 +376 400 +424 390 +430 375 +424 344 +413 313 +400 302 +381 303 +338 314 +329 326 +12 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 4.7803 82.0619 ] concat +%I 10 +234 414 +294 389 +309 389 +362 431 +335 350 +311 329 +277 328 +253 336 +238 346 +231 384 +10 Poly +End + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 4.7803 82.0619 ] concat +%I 28 +66 417 +78 418 +79 399 +70 350 +81 323 +116 305 +170 301 +225 316 +252 344 +264 377 +261 410 +257 422 +266 443 +272 474 +276 490 +269 505 +244 511 +227 504 +218 486 +210 452 +206 422 +192 392 +170 383 +142 388 +108 405 +94 425 +78 429 +72 425 +28 Poly +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I CBSpl +none SetB %I b n +%I cfg White +1 1 1 SetCFg +%I cbg MyOrange +1 0.498039 0 SetCBg +%I p +1 SetP +%I t +[ 0.701599 -0.11276 0.11276 0.701599 -80.1562 124.223 ] concat +%I 13 +295 536 +323 536 +369 521 +391 532 +391 532 +381 508 +341 507 +311 498 +281 509 +248 510 +240 537 +240 537 +265 524 +13 CBSpl +End + +Begin %I BSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg LtGray +0.764706 0.764706 0.764706 SetCBg +none SetP %I p n +%I t u +%I 5 +149 473 +164 456 +197 452 +235 442 +254 453 +5 BSpl +%I 1 +End + +End %I eop + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.796717 -0 -0 0.796717 4.7803 82.0619 ] concat +%I 11 +112 491 +127 452 +149 426 +181 420 +220 421 +185 359 +170 356 +131 366 +108 389 +102 414 +103 444 +11 Poly +End + +End %I eop + +End %I eop + +showpage + +%%Trailer + +end diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/demos/flags/flags.0 iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/flags/flags.0 --- iv-3.1/iv/src/examples/edraw/demos/flags/flags.0 Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/flags/flags.0 Tue Apr 2 13:52:31 1996 @@ -0,0 +1,2789 @@ +%!PS-Adobe-2.0 EPSF-1.2 +%%Creator: idraw +%%DocumentFonts: +%%Pages: 1 +%%BoundingBox: 55 26 565 758 +%%EndComments + +%%BeginIdrawPrologue +/arrowhead { +0 begin +transform originalCTM itransform +/taily exch def +/tailx exch def +transform originalCTM itransform +/tipy exch def +/tipx exch def +/dy tipy taily sub def +/dx tipx tailx sub def +/angle dx 0 ne dy 0 ne or { dy dx atan } { 90 } ifelse def +gsave +originalCTM setmatrix +tipx tipy translate +angle rotate +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +patternNone not { +originalCTM setmatrix +/padtip arrowHeight 2 exp 0.25 arrowWidth 2 exp mul add sqrt brushWidth mul +arrowWidth div def +/padtail brushWidth 2 div def +tipx tipy translate +angle rotate +padtip 0 translate +arrowHeight padtip add padtail add arrowHeight div dup scale +arrowheadpath +ifill +} if +brushNone not { +originalCTM setmatrix +tipx tipy translate +angle rotate +arrowheadpath +istroke +} if +grestore +end +} dup 0 9 dict put def + +/arrowheadpath { +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +} def + +/leftarrow { +0 begin +y exch get /taily exch def +x exch get /tailx exch def +y exch get /tipy exch def +x exch get /tipx exch def +brushLeftArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +/rightarrow { +0 begin +y exch get /tipy exch def +x exch get /tipx exch def +y exch get /taily exch def +x exch get /tailx exch def +brushRightArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +%%EndIdrawPrologue + +/arrowHeight 10 def +/arrowWidth 5 def + +/IdrawDict 50 dict def +IdrawDict begin + +/none null def +/numGraphicParameters 17 def +/stringLimit 65535 def + +/Begin { +save +numGraphicParameters dict begin +} def + +/End { +end +restore +} def + +/SetB { +dup type /nulltype eq { +pop +false /brushRightArrow idef +false /brushLeftArrow idef +true /brushNone idef +} { +/brushDashOffset idef +/brushDashArray idef +0 ne /brushRightArrow idef +0 ne /brushLeftArrow idef +/brushWidth idef +false /brushNone idef +} ifelse +} def + +/SetCFg { +/fgblue idef +/fggreen idef +/fgred idef +} def + +/SetCBg { +/bgblue idef +/bggreen idef +/bgred idef +} def + +/SetF { +/printSize idef +/printFont idef +} def + +/SetP { +dup type /nulltype eq { +pop true /patternNone idef +} { +dup -1 eq { +/patternGrayLevel idef +/patternString idef +} { +/patternGrayLevel idef +} ifelse +false /patternNone idef +} ifelse +} def + +/BSpl { +0 begin +storexyn +newpath +n 1 gt { +0 0 0 0 0 0 1 1 true subspline +n 2 gt { +0 0 0 0 1 1 2 2 false subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 2 copy false subspline +} if +n 2 sub dup n 1 sub dup 2 copy 2 copy false subspline +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Circ { +newpath +0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/CBSpl { +0 begin +dup 2 gt { +storexyn +newpath +n 1 sub dup 0 0 1 1 2 2 true subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 0 0 false subspline +n 2 sub dup n 1 sub dup 0 0 1 1 false subspline +patternNone not { ifill } if +brushNone not { istroke } if +} { +Poly +} ifelse +end +} dup 0 4 dict put def + +/Elli { +0 begin +newpath +4 2 roll +translate +scale +0 0 1 0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 1 dict put def + +/Line { +0 begin +2 storexyn +newpath +x 0 get y 0 get moveto +x 1 get y 1 get lineto +brushNone not { istroke } if +0 0 1 1 leftarrow +0 0 1 1 rightarrow +end +} dup 0 4 dict put def + +/MLine { +0 begin +storexyn +newpath +n 1 gt { +x 0 get y 0 get moveto +1 1 n 1 sub { +/i exch def +x i get y i get lineto +} for +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Poly { +3 1 roll +newpath +moveto +-1 add +{ lineto } repeat +closepath +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/Rect { +0 begin +/t exch def +/r exch def +/b exch def +/l exch def +newpath +l b moveto +l t lineto +r t lineto +r b lineto +closepath +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 4 dict put def + +/Text { +ishow +} def + +/idef { +dup where { pop pop pop } { exch def } ifelse +} def + +/ifill { +0 begin +gsave +patternGrayLevel -1 ne { +fgred bgred fgred sub patternGrayLevel mul add +fggreen bggreen fggreen sub patternGrayLevel mul add +fgblue bgblue fgblue sub patternGrayLevel mul add setrgbcolor +eofill +} { +eoclip +originalCTM setmatrix +pathbbox /t exch def /r exch def /b exch def /l exch def +/w r l sub ceiling cvi def +/h t b sub ceiling cvi def +/imageByteWidth w 8 div ceiling cvi def +/imageHeight h def +bgred bggreen bgblue setrgbcolor +eofill +fgred fggreen fgblue setrgbcolor +w 0 gt h 0 gt and { +l w add b translate w neg h scale +w h true [w 0 0 h neg 0 h] { patternproc } imagemask +} if +} ifelse +grestore +end +} dup 0 8 dict put def + +/istroke { +gsave +brushDashOffset -1 eq { +[] 0 setdash +1 setgray +} { +brushDashArray brushDashOffset setdash +fgred fggreen fgblue setrgbcolor +} ifelse +brushWidth setlinewidth +originalCTM setmatrix +stroke +grestore +} def + +/ishow { +0 begin +gsave +fgred fggreen fgblue setrgbcolor +/fontDict printFont printSize scalefont dup setfont def +/descender fontDict begin 0 [FontBBox] 1 get FontMatrix end +transform exch pop def +/vertoffset 1 printSize sub descender sub def { +0 vertoffset moveto show +/vertoffset vertoffset printSize sub def +} forall +grestore +end +} dup 0 3 dict put def +/patternproc { +0 begin +/patternByteLength patternString length def +/patternHeight patternByteLength 8 mul sqrt cvi def +/patternWidth patternHeight def +/patternByteWidth patternWidth 8 idiv def +/imageByteMaxLength imageByteWidth imageHeight mul +stringLimit patternByteWidth sub min def +/imageMaxHeight imageByteMaxLength imageByteWidth idiv patternHeight idiv +patternHeight mul patternHeight max def +/imageHeight imageHeight imageMaxHeight sub store +/imageString imageByteWidth imageMaxHeight mul patternByteWidth add string def +0 1 imageMaxHeight 1 sub { +/y exch def +/patternRow y patternByteWidth mul patternByteLength mod def +/patternRowString patternString patternRow patternByteWidth getinterval def +/imageRow y imageByteWidth mul def +0 patternByteWidth imageByteWidth 1 sub { +/x exch def +imageString imageRow x add patternRowString putinterval +} for +} for +imageString +end +} dup 0 12 dict put def + +/min { +dup 3 2 roll dup 4 3 roll lt { exch } if pop +} def + +/max { +dup 3 2 roll dup 4 3 roll gt { exch } if pop +} def + +/midpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 x1 add 2 div +y0 y1 add 2 div +end +} dup 0 4 dict put def + +/thirdpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 2 mul x1 add 3 div +y0 2 mul y1 add 3 div +end +} dup 0 4 dict put def + +/subspline { +0 begin +/movetoNeeded exch def +y exch get /y3 exch def +x exch get /x3 exch def +y exch get /y2 exch def +x exch get /x2 exch def +y exch get /y1 exch def +x exch get /x1 exch def +y exch get /y0 exch def +x exch get /x0 exch def +x1 y1 x2 y2 thirdpoint +/p1y exch def +/p1x exch def +x2 y2 x1 y1 thirdpoint +/p2y exch def +/p2x exch def +x1 y1 x0 y0 thirdpoint +p1x p1y midpoint +/p0y exch def +/p0x exch def +x2 y2 x3 y3 thirdpoint +p2x p2y midpoint +/p3y exch def +/p3x exch def +movetoNeeded { p0x p0y moveto } if +p1x p1y p2x p2y p3x p3y curveto +end +} dup 0 17 dict put def + +/storexyn { +/n exch def +/y n array def +/x n array def +n 1 sub -1 0 { +/i exch def +y i 3 2 roll put +x i 3 2 roll put +} for +} def + +/SSten { +fgred fggreen fgblue setrgbcolor +dup true exch 1 0 0 -1 0 6 -1 roll matrix astore +} def + +/FSten { +dup 3 -1 roll dup 4 1 roll exch +newpath +0 0 moveto +dup 0 exch lineto +exch dup 3 1 roll exch lineto +0 lineto +closepath +bgred bggreen bgblue setrgbcolor +eofill +SSten +} def + +/Rast { +exch dup 3 1 roll 1 0 0 -1 0 6 -1 roll matrix astore +} def + +%%EndProlog + +%I Idraw 10 Grid 4.78495 4.78495 + +%%Page: 1 1 + +Begin +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1.16812e-08 -0.96 0.96 1.16812e-08 0 792 ] concat +/originalCTM matrix currentmatrix def + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.5 0 0 0.5 0.0165005 318.568 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg LtGray +0.764706 0.764706 0.764706 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.37618 0 0 1.96552 -484.801 0.773193 ] concat +%I +241 33 537 265 Rect +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Blue +0 0 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.37618 0 0 1.96552 -499.801 15.7732 ] concat +%I +241 33 537 265 Rect +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 -34.4819 177.656 ] concat + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 -7.62939e-06 0 ] concat + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 1.17448 0 0 1 -175.709 93.9789 ] concat +%I 7 +241 265 +241 249 +513 33 +537 33 +537 49 +265 265 +241 265 +7 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -1.17448 0 0 1 738.037 93.9789 ] concat +%I 7 +241 265 +241 249 +513 33 +537 33 +537 49 +265 265 +241 265 +7 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.58724 0 0 0.5 140.226 450.479 ] concat +%I 4 +-56 -207 +209 -415 +241 -415 +-56 -183 +4 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.58724 0 0 0.5 248.866 334.479 ] concat +%I 4 +-56 -207 +209 -415 +241 -415 +-56 -183 +4 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.58724 0 0 -0.5 313.462 151.479 ] concat +%I 4 +-56 -207 +209 -415 +241 -415 +-56 -183 +4 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.58724 -1.21679e-08 1.4291e-08 -0.5 422.102 35.4789 ] concat +%I 4 +-56 -207 +209 -415 +241 -415 +-56 -183 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.5 0 0 0.5 76.7339 81.4893 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 3.78328e-08 2.83877 -3.10921 3.45421e-08 1606.53 -417.94 ] concat +%I +241 273 281 497 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.43331 0 0 2.07143 -226.234 -474.522 ] concat +%I +241 273 281 497 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 1.74715 0 0 2.07143 -47.1462 -474.522 ] concat +%I +241 273 281 497 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 3.78192e-08 1.99185 -3.10809 2.42368e-08 1606.23 -196.895 ] concat +%I +241 273 281 497 Rect +End + +End %I eop + +End %I eop + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.357895 0 0 0.357895 553.642 211.658 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.352201 0 0 0.352201 163.69 87.0944 ] concat +%I 15 +236 525 +203 425 +105 462 +163 374 +74 320 +178 311 +164 208 +236 282 +308 207 +294 311 +399 320 +308 374 +366 462 +268 425 +236 525 +15 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.211321 0 0 0.211321 550.023 378.657 ] concat +%I 15 +236 525 +203 425 +105 462 +163 374 +74 320 +178 311 +164 208 +236 282 +308 207 +294 311 +399 320 +308 374 +366 462 +268 425 +236 525 +15 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.211321 0 0 0.211321 533.008 116.257 ] concat +%I 15 +236 525 +203 425 +105 462 +163 374 +74 320 +178 311 +164 208 +236 282 +308 207 +294 311 +399 320 +308 374 +366 462 +268 425 +236 525 +15 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.211321 0 0 0.211321 461.008 242.657 ] concat +%I 15 +236 525 +203 425 +105 462 +163 374 +74 320 +178 311 +164 208 +236 282 +308 207 +294 311 +399 320 +308 374 +366 462 +268 425 +236 525 +15 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.211321 0 0 0.211321 629.008 266.657 ] concat +%I 15 +236 525 +203 425 +105 462 +163 374 +74 320 +178 311 +164 208 +236 282 +308 207 +294 311 +399 320 +308 374 +366 462 +268 425 +236 525 +15 Poly +End + +End %I eop + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 2.37618 0 0 1.96552 -499.801 15.7732 ] concat +%I +241 33 537 265 Rect +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.5 0 0 0.5 409.019 310.575 ] concat + +Begin %I Rect +none SetB %I b n +%I cfg LtGray +0.764706 0.764706 0.764706 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 1.00143 0 0 0.998499 -8.25678 -10.5422 ] concat +%I +81 90 782 548 Rect +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1.17448 0 0 1 126.985 737.979 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Blue +0 0 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2 0 0 2 -538 -713 ] concat +%I +241 33 537 265 Rect +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2 0 0 2 -538 -713 ] concat +%I 7 +241 265 +241 249 +513 33 +537 33 +537 49 +265 265 +241 265 +7 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -2 0 0 2 1018 -713 ] concat +%I 7 +241 265 +241 249 +513 33 +537 33 +537 49 +265 265 +241 265 +7 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t u +%I 4 +-56 -207 +209 -415 +241 -415 +-56 -183 +4 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -1 0 0 1 185 -232 ] concat +%I 4 +-56 -207 +209 -415 +241 -415 +-56 -183 +4 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 1 0 0 -1 295 -598 ] concat +%I 4 +-56 -207 +209 -415 +241 -415 +-56 -183 +4 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -1 -2.43359e-08 2.43359e-08 -1 480 -830 ] concat +%I 4 +-56 -207 +209 -415 +241 -415 +-56 -183 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 3.78328e-08 2.83877 -3.10921 3.45421e-08 1606.53 -417.94 ] concat +%I +241 273 281 497 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.43331 0 0 2.07143 -226.234 -474.522 ] concat +%I +241 273 281 497 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 1.74715 0 0 2.07143 -47.1462 -474.522 ] concat +%I +241 273 281 497 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 3.78192e-08 1.99185 -3.10809 2.42368e-08 1606.23 -196.895 ] concat +%I +241 273 281 497 Rect +End + +End %I eop + +End %I eop + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 1.17613 0 0 1 -70.3121 -6.021 ] concat +%I +112 97 704 561 Rect +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Rect +none SetB %I b n +%I cfg LtGray +0.764706 0.764706 0.764706 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.500715 0 0 0.499249 6.1928 13.7814 ] concat +%I +81 90 782 548 Rect +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.5 0 0 0.5 -0.74915 21.391 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 56.7763 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 21.573 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -13.6303 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -48.8337 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -84.037 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -119.24 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -154.444 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -189.647 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -224.85 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -260.054 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -295.257 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -330.46 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -365.664 ] concat +%I +344 521 624 561 Rect +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Rect +none SetB %I b n +%I cfg Blue +0 0 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.133803 0 0 0.133803 77.7863 182.363 ] concat +%I +-288 -80 848 841 Rect +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 26.7271 249.398 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 52.9525 249.398 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 79.1779 249.398 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 39.8398 236.419 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 66.0652 236.419 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 92.2906 236.419 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 26.7271 275.356 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 52.9525 275.356 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 79.1779 275.356 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 39.8398 262.377 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 66.0652 262.377 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 92.2906 262.377 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 26.7271 197.483 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 52.9525 197.483 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 79.1779 197.483 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 39.8398 184.504 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 66.0652 184.504 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 92.2906 184.504 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 26.7271 223.441 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 52.9525 223.441 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 79.1779 223.441 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 39.8398 210.462 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 66.0652 210.462 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 92.2906 210.462 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 105.403 249.398 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 131.629 249.398 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 157.854 249.398 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 118.516 236.419 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 144.741 236.419 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 105.403 275.356 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 131.629 275.356 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 157.854 275.356 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 118.516 262.377 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 144.741 262.377 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 105.403 197.483 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 131.629 197.483 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 157.854 197.483 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 118.516 184.504 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 144.741 184.504 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 105.403 223.441 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 131.629 223.441 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 157.854 223.441 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 118.516 210.462 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 144.741 210.462 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 26.7271 171.525 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 52.9525 171.525 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 79.1779 171.525 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 105.403 171.525 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 131.629 171.525 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 157.854 171.525 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +End %I eop + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 0.500715 0 0 0.499249 -1.30695 21.2711 ] concat +%I +81 90 782 548 Rect +End + +End %I eop + +End %I eop + +End %I eop + +showpage + +%%Trailer + +end diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/demos/flags/flags.1 iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/flags/flags.1 --- iv-3.1/iv/src/examples/edraw/demos/flags/flags.1 Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/flags/flags.1 Tue Apr 2 13:52:32 1996 @@ -0,0 +1,2137 @@ +%!PS-Adobe-2.0 EPSF-1.2 +%%Creator: idraw +%%DocumentFonts: +%%Pages: 1 +%%BoundingBox: 62 34 565 758 +%%EndComments + +%%BeginIdrawPrologue +/arrowhead { +0 begin +transform originalCTM itransform +/taily exch def +/tailx exch def +transform originalCTM itransform +/tipy exch def +/tipx exch def +/dy tipy taily sub def +/dx tipx tailx sub def +/angle dx 0 ne dy 0 ne or { dy dx atan } { 90 } ifelse def +gsave +originalCTM setmatrix +tipx tipy translate +angle rotate +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +patternNone not { +originalCTM setmatrix +/padtip arrowHeight 2 exp 0.25 arrowWidth 2 exp mul add sqrt brushWidth mul +arrowWidth div def +/padtail brushWidth 2 div def +tipx tipy translate +angle rotate +padtip 0 translate +arrowHeight padtip add padtail add arrowHeight div dup scale +arrowheadpath +ifill +} if +brushNone not { +originalCTM setmatrix +tipx tipy translate +angle rotate +arrowheadpath +istroke +} if +grestore +end +} dup 0 9 dict put def + +/arrowheadpath { +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +} def + +/leftarrow { +0 begin +y exch get /taily exch def +x exch get /tailx exch def +y exch get /tipy exch def +x exch get /tipx exch def +brushLeftArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +/rightarrow { +0 begin +y exch get /tipy exch def +x exch get /tipx exch def +y exch get /taily exch def +x exch get /tailx exch def +brushRightArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +%%EndIdrawPrologue + +/arrowHeight 10 def +/arrowWidth 5 def + +/IdrawDict 50 dict def +IdrawDict begin + +/none null def +/numGraphicParameters 17 def +/stringLimit 65535 def + +/Begin { +save +numGraphicParameters dict begin +} def + +/End { +end +restore +} def + +/SetB { +dup type /nulltype eq { +pop +false /brushRightArrow idef +false /brushLeftArrow idef +true /brushNone idef +} { +/brushDashOffset idef +/brushDashArray idef +0 ne /brushRightArrow idef +0 ne /brushLeftArrow idef +/brushWidth idef +false /brushNone idef +} ifelse +} def + +/SetCFg { +/fgblue idef +/fggreen idef +/fgred idef +} def + +/SetCBg { +/bgblue idef +/bggreen idef +/bgred idef +} def + +/SetF { +/printSize idef +/printFont idef +} def + +/SetP { +dup type /nulltype eq { +pop true /patternNone idef +} { +dup -1 eq { +/patternGrayLevel idef +/patternString idef +} { +/patternGrayLevel idef +} ifelse +false /patternNone idef +} ifelse +} def + +/BSpl { +0 begin +storexyn +newpath +n 1 gt { +0 0 0 0 0 0 1 1 true subspline +n 2 gt { +0 0 0 0 1 1 2 2 false subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 2 copy false subspline +} if +n 2 sub dup n 1 sub dup 2 copy 2 copy false subspline +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Circ { +newpath +0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/CBSpl { +0 begin +dup 2 gt { +storexyn +newpath +n 1 sub dup 0 0 1 1 2 2 true subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 0 0 false subspline +n 2 sub dup n 1 sub dup 0 0 1 1 false subspline +patternNone not { ifill } if +brushNone not { istroke } if +} { +Poly +} ifelse +end +} dup 0 4 dict put def + +/Elli { +0 begin +newpath +4 2 roll +translate +scale +0 0 1 0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 1 dict put def + +/Line { +0 begin +2 storexyn +newpath +x 0 get y 0 get moveto +x 1 get y 1 get lineto +brushNone not { istroke } if +0 0 1 1 leftarrow +0 0 1 1 rightarrow +end +} dup 0 4 dict put def + +/MLine { +0 begin +storexyn +newpath +n 1 gt { +x 0 get y 0 get moveto +1 1 n 1 sub { +/i exch def +x i get y i get lineto +} for +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Poly { +3 1 roll +newpath +moveto +-1 add +{ lineto } repeat +closepath +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/Rect { +0 begin +/t exch def +/r exch def +/b exch def +/l exch def +newpath +l b moveto +l t lineto +r t lineto +r b lineto +closepath +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 4 dict put def + +/Text { +ishow +} def + +/idef { +dup where { pop pop pop } { exch def } ifelse +} def + +/ifill { +0 begin +gsave +patternGrayLevel -1 ne { +fgred bgred fgred sub patternGrayLevel mul add +fggreen bggreen fggreen sub patternGrayLevel mul add +fgblue bgblue fgblue sub patternGrayLevel mul add setrgbcolor +eofill +} { +eoclip +originalCTM setmatrix +pathbbox /t exch def /r exch def /b exch def /l exch def +/w r l sub ceiling cvi def +/h t b sub ceiling cvi def +/imageByteWidth w 8 div ceiling cvi def +/imageHeight h def +bgred bggreen bgblue setrgbcolor +eofill +fgred fggreen fgblue setrgbcolor +w 0 gt h 0 gt and { +l w add b translate w neg h scale +w h true [w 0 0 h neg 0 h] { patternproc } imagemask +} if +} ifelse +grestore +end +} dup 0 8 dict put def + +/istroke { +gsave +brushDashOffset -1 eq { +[] 0 setdash +1 setgray +} { +brushDashArray brushDashOffset setdash +fgred fggreen fgblue setrgbcolor +} ifelse +brushWidth setlinewidth +originalCTM setmatrix +stroke +grestore +} def + +/ishow { +0 begin +gsave +fgred fggreen fgblue setrgbcolor +/fontDict printFont printSize scalefont dup setfont def +/descender fontDict begin 0 [FontBBox] 1 get FontMatrix end +transform exch pop def +/vertoffset 1 printSize sub descender sub def { +0 vertoffset moveto show +/vertoffset vertoffset printSize sub def +} forall +grestore +end +} dup 0 3 dict put def +/patternproc { +0 begin +/patternByteLength patternString length def +/patternHeight patternByteLength 8 mul sqrt cvi def +/patternWidth patternHeight def +/patternByteWidth patternWidth 8 idiv def +/imageByteMaxLength imageByteWidth imageHeight mul +stringLimit patternByteWidth sub min def +/imageMaxHeight imageByteMaxLength imageByteWidth idiv patternHeight idiv +patternHeight mul patternHeight max def +/imageHeight imageHeight imageMaxHeight sub store +/imageString imageByteWidth imageMaxHeight mul patternByteWidth add string def +0 1 imageMaxHeight 1 sub { +/y exch def +/patternRow y patternByteWidth mul patternByteLength mod def +/patternRowString patternString patternRow patternByteWidth getinterval def +/imageRow y imageByteWidth mul def +0 patternByteWidth imageByteWidth 1 sub { +/x exch def +imageString imageRow x add patternRowString putinterval +} for +} for +imageString +end +} dup 0 12 dict put def + +/min { +dup 3 2 roll dup 4 3 roll lt { exch } if pop +} def + +/max { +dup 3 2 roll dup 4 3 roll gt { exch } if pop +} def + +/midpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 x1 add 2 div +y0 y1 add 2 div +end +} dup 0 4 dict put def + +/thirdpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 2 mul x1 add 3 div +y0 2 mul y1 add 3 div +end +} dup 0 4 dict put def + +/subspline { +0 begin +/movetoNeeded exch def +y exch get /y3 exch def +x exch get /x3 exch def +y exch get /y2 exch def +x exch get /x2 exch def +y exch get /y1 exch def +x exch get /x1 exch def +y exch get /y0 exch def +x exch get /x0 exch def +x1 y1 x2 y2 thirdpoint +/p1y exch def +/p1x exch def +x2 y2 x1 y1 thirdpoint +/p2y exch def +/p2x exch def +x1 y1 x0 y0 thirdpoint +p1x p1y midpoint +/p0y exch def +/p0x exch def +x2 y2 x3 y3 thirdpoint +p2x p2y midpoint +/p3y exch def +/p3x exch def +movetoNeeded { p0x p0y moveto } if +p1x p1y p2x p2y p3x p3y curveto +end +} dup 0 17 dict put def + +/storexyn { +/n exch def +/y n array def +/x n array def +n 1 sub -1 0 { +/i exch def +y i 3 2 roll put +x i 3 2 roll put +} for +} def + +/SSten { +fgred fggreen fgblue setrgbcolor +dup true exch 1 0 0 -1 0 6 -1 roll matrix astore +} def + +/FSten { +dup 3 -1 roll dup 4 1 roll exch +newpath +0 0 moveto +dup 0 exch lineto +exch dup 3 1 roll exch lineto +0 lineto +closepath +bgred bggreen bgblue setrgbcolor +eofill +SSten +} def + +/Rast { +exch dup 3 1 roll 1 0 0 -1 0 6 -1 roll matrix astore +} def + +%%EndProlog + +%I Idraw 10 Grid 4.78495 4.78495 + +%%Page: 1 1 + +Begin +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1.16812e-08 -0.96 0.96 1.16812e-08 0 792 ] concat +/originalCTM matrix currentmatrix def + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.5 0 0 0.5 0.0165005 318.568 ] concat + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Blue +0 0 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.37618 0 0 1.96552 -499.801 15.7732 ] concat +%I +241 33 537 265 Rect +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 -34.4819 177.656 ] concat + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 -7.62939e-06 0 ] concat + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 1.17448 0 0 1 -175.709 93.9789 ] concat +%I 7 +241 265 +241 249 +513 33 +537 33 +537 49 +265 265 +241 265 +7 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -1.17448 0 0 1 738.037 93.9789 ] concat +%I 7 +241 265 +241 249 +513 33 +537 33 +537 49 +265 265 +241 265 +7 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.58724 0 0 0.5 140.226 450.479 ] concat +%I 4 +-56 -207 +209 -415 +241 -415 +-56 -183 +4 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.58724 0 0 0.5 248.866 334.479 ] concat +%I 4 +-56 -207 +209 -415 +241 -415 +-56 -183 +4 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.58724 0 0 -0.5 313.462 151.479 ] concat +%I 4 +-56 -207 +209 -415 +241 -415 +-56 -183 +4 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -0.58724 -1.21679e-08 1.4291e-08 -0.5 422.102 35.4789 ] concat +%I 4 +-56 -207 +209 -415 +241 -415 +-56 -183 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.5 0 0 0.5 76.7339 81.4893 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 3.78328e-08 2.83877 -3.10921 3.45421e-08 1606.53 -417.94 ] concat +%I +241 273 281 497 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.43331 0 0 2.07143 -226.234 -474.522 ] concat +%I +241 273 281 497 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 1.74715 0 0 2.07143 -47.1462 -474.522 ] concat +%I +241 273 281 497 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 3.78192e-08 1.99185 -3.10809 2.42368e-08 1606.23 -196.895 ] concat +%I +241 273 281 497 Rect +End + +End %I eop + +End %I eop + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.357895 0 0 0.357895 553.642 211.658 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.352201 0 0 0.352201 163.69 87.0944 ] concat +%I 15 +236 525 +203 425 +105 462 +163 374 +74 320 +178 311 +164 208 +236 282 +308 207 +294 311 +399 320 +308 374 +366 462 +268 425 +236 525 +15 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.211321 0 0 0.211321 550.023 378.657 ] concat +%I 15 +236 525 +203 425 +105 462 +163 374 +74 320 +178 311 +164 208 +236 282 +308 207 +294 311 +399 320 +308 374 +366 462 +268 425 +236 525 +15 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.211321 0 0 0.211321 533.008 116.257 ] concat +%I 15 +236 525 +203 425 +105 462 +163 374 +74 320 +178 311 +164 208 +236 282 +308 207 +294 311 +399 320 +308 374 +366 462 +268 425 +236 525 +15 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.211321 0 0 0.211321 461.008 242.657 ] concat +%I 15 +236 525 +203 425 +105 462 +163 374 +74 320 +178 311 +164 208 +236 282 +308 207 +294 311 +399 320 +308 374 +366 462 +268 425 +236 525 +15 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.211321 0 0 0.211321 629.008 266.657 ] concat +%I 15 +236 525 +203 425 +105 462 +163 374 +74 320 +178 311 +164 208 +236 282 +308 207 +294 311 +399 320 +308 374 +366 462 +268 425 +236 525 +15 Poly +End + +End %I eop + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 2.37618 0 0 1.96552 -499.801 15.7732 ] concat +%I +241 33 537 265 Rect +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.5 0 0 0.5 409.019 310.575 ] concat + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1.17448 0 0 1 126.985 737.979 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Blue +0 0 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2 0 0 2 -538 -713 ] concat +%I +241 33 537 265 Rect +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2 0 0 2 -538 -713 ] concat +%I 7 +241 265 +241 249 +513 33 +537 33 +537 49 +265 265 +241 265 +7 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -2 0 0 2 1018 -713 ] concat +%I 7 +241 265 +241 249 +513 33 +537 33 +537 49 +265 265 +241 265 +7 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t u +%I 4 +-56 -207 +209 -415 +241 -415 +-56 -183 +4 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -1 0 0 1 185 -232 ] concat +%I 4 +-56 -207 +209 -415 +241 -415 +-56 -183 +4 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 1 0 0 -1 295 -598 ] concat +%I 4 +-56 -207 +209 -415 +241 -415 +-56 -183 +4 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ -1 -2.43359e-08 2.43359e-08 -1 480 -830 ] concat +%I 4 +-56 -207 +209 -415 +241 -415 +-56 -183 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 3.78328e-08 2.83877 -3.10921 3.45421e-08 1606.53 -417.94 ] concat +%I +241 273 281 497 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.43331 0 0 2.07143 -226.234 -474.522 ] concat +%I +241 273 281 497 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 1.74715 0 0 2.07143 -47.1462 -474.522 ] concat +%I +241 273 281 497 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 3.78192e-08 1.99185 -3.10809 2.42368e-08 1606.23 -196.895 ] concat +%I +241 273 281 497 Rect +End + +End %I eop + +End %I eop + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 1.17613 0 0 1 -70.3121 -6.021 ] concat +%I +112 97 704 561 Rect +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.500715 0 0 0.499249 -1.30695 21.2711 ] concat +%I +81 90 782 548 Rect +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.5 0 0 0.5 -0.74915 21.391 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 56.7763 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -13.6303 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -84.037 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -154.444 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -224.85 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -295.257 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -365.664 ] concat +%I +344 521 624 561 Rect +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Rect +none SetB %I b n +%I cfg Blue +0 0 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.133803 0 0 0.133803 77.7863 182.363 ] concat +%I +-288 -80 848 841 Rect +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 26.7271 249.398 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 52.9525 249.398 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 79.1779 249.398 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 26.7271 275.356 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 52.9525 275.356 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 79.1779 275.356 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 26.7271 197.483 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 52.9525 197.483 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 79.1779 197.483 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 26.7271 223.441 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 52.9525 223.441 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 79.1779 223.441 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 105.403 249.398 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 131.629 249.398 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 157.854 249.398 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 105.403 275.356 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 131.629 275.356 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 157.854 275.356 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 105.403 197.483 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 131.629 197.483 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 157.854 197.483 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 105.403 223.441 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 131.629 223.441 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 157.854 223.441 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 26.7271 171.525 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 52.9525 171.525 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 79.1779 171.525 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 105.403 171.525 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 131.629 171.525 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 157.854 171.525 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +End %I eop + +End %I eop + +End %I eop + +End %I eop + +showpage + +%%Trailer + +end diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/demos/flags/flags.2 iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/flags/flags.2 --- iv-3.1/iv/src/examples/edraw/demos/flags/flags.2 Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/flags/flags.2 Tue Apr 2 13:52:32 1996 @@ -0,0 +1,1159 @@ +%!PS-Adobe-2.0 EPSF-1.2 +%%Creator: idraw +%%DocumentFonts: +%%Pages: 1 +%%BoundingBox: 61 33 567 759 +%%EndComments + +%%BeginIdrawPrologue +/arrowhead { +0 begin +transform originalCTM itransform +/taily exch def +/tailx exch def +transform originalCTM itransform +/tipy exch def +/tipx exch def +/dy tipy taily sub def +/dx tipx tailx sub def +/angle dx 0 ne dy 0 ne or { dy dx atan } { 90 } ifelse def +gsave +originalCTM setmatrix +tipx tipy translate +angle rotate +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +patternNone not { +originalCTM setmatrix +/padtip arrowHeight 2 exp 0.25 arrowWidth 2 exp mul add sqrt brushWidth mul +arrowWidth div def +/padtail brushWidth 2 div def +tipx tipy translate +angle rotate +padtip 0 translate +arrowHeight padtip add padtail add arrowHeight div dup scale +arrowheadpath +ifill +} if +brushNone not { +originalCTM setmatrix +tipx tipy translate +angle rotate +arrowheadpath +istroke +} if +grestore +end +} dup 0 9 dict put def + +/arrowheadpath { +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +} def + +/leftarrow { +0 begin +y exch get /taily exch def +x exch get /tailx exch def +y exch get /tipy exch def +x exch get /tipx exch def +brushLeftArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +/rightarrow { +0 begin +y exch get /tipy exch def +x exch get /tipx exch def +y exch get /taily exch def +x exch get /tailx exch def +brushRightArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +%%EndIdrawPrologue + +/arrowHeight 10 def +/arrowWidth 5 def + +/IdrawDict 50 dict def +IdrawDict begin + +/none null def +/numGraphicParameters 17 def +/stringLimit 65535 def + +/Begin { +save +numGraphicParameters dict begin +} def + +/End { +end +restore +} def + +/SetB { +dup type /nulltype eq { +pop +false /brushRightArrow idef +false /brushLeftArrow idef +true /brushNone idef +} { +/brushDashOffset idef +/brushDashArray idef +0 ne /brushRightArrow idef +0 ne /brushLeftArrow idef +/brushWidth idef +false /brushNone idef +} ifelse +} def + +/SetCFg { +/fgblue idef +/fggreen idef +/fgred idef +} def + +/SetCBg { +/bgblue idef +/bggreen idef +/bgred idef +} def + +/SetF { +/printSize idef +/printFont idef +} def + +/SetP { +dup type /nulltype eq { +pop true /patternNone idef +} { +dup -1 eq { +/patternGrayLevel idef +/patternString idef +} { +/patternGrayLevel idef +} ifelse +false /patternNone idef +} ifelse +} def + +/BSpl { +0 begin +storexyn +newpath +n 1 gt { +0 0 0 0 0 0 1 1 true subspline +n 2 gt { +0 0 0 0 1 1 2 2 false subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 2 copy false subspline +} if +n 2 sub dup n 1 sub dup 2 copy 2 copy false subspline +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Circ { +newpath +0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/CBSpl { +0 begin +dup 2 gt { +storexyn +newpath +n 1 sub dup 0 0 1 1 2 2 true subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 0 0 false subspline +n 2 sub dup n 1 sub dup 0 0 1 1 false subspline +patternNone not { ifill } if +brushNone not { istroke } if +} { +Poly +} ifelse +end +} dup 0 4 dict put def + +/Elli { +0 begin +newpath +4 2 roll +translate +scale +0 0 1 0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 1 dict put def + +/Line { +0 begin +2 storexyn +newpath +x 0 get y 0 get moveto +x 1 get y 1 get lineto +brushNone not { istroke } if +0 0 1 1 leftarrow +0 0 1 1 rightarrow +end +} dup 0 4 dict put def + +/MLine { +0 begin +storexyn +newpath +n 1 gt { +x 0 get y 0 get moveto +1 1 n 1 sub { +/i exch def +x i get y i get lineto +} for +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Poly { +3 1 roll +newpath +moveto +-1 add +{ lineto } repeat +closepath +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/Rect { +0 begin +/t exch def +/r exch def +/b exch def +/l exch def +newpath +l b moveto +l t lineto +r t lineto +r b lineto +closepath +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 4 dict put def + +/Text { +ishow +} def + +/idef { +dup where { pop pop pop } { exch def } ifelse +} def + +/ifill { +0 begin +gsave +patternGrayLevel -1 ne { +fgred bgred fgred sub patternGrayLevel mul add +fggreen bggreen fggreen sub patternGrayLevel mul add +fgblue bgblue fgblue sub patternGrayLevel mul add setrgbcolor +eofill +} { +eoclip +originalCTM setmatrix +pathbbox /t exch def /r exch def /b exch def /l exch def +/w r l sub ceiling cvi def +/h t b sub ceiling cvi def +/imageByteWidth w 8 div ceiling cvi def +/imageHeight h def +bgred bggreen bgblue setrgbcolor +eofill +fgred fggreen fgblue setrgbcolor +w 0 gt h 0 gt and { +l w add b translate w neg h scale +w h true [w 0 0 h neg 0 h] { patternproc } imagemask +} if +} ifelse +grestore +end +} dup 0 8 dict put def + +/istroke { +gsave +brushDashOffset -1 eq { +[] 0 setdash +1 setgray +} { +brushDashArray brushDashOffset setdash +fgred fggreen fgblue setrgbcolor +} ifelse +brushWidth setlinewidth +originalCTM setmatrix +stroke +grestore +} def + +/ishow { +0 begin +gsave +fgred fggreen fgblue setrgbcolor +/fontDict printFont printSize scalefont dup setfont def +/descender fontDict begin 0 [FontBBox] 1 get FontMatrix end +transform exch pop def +/vertoffset 1 printSize sub descender sub def { +0 vertoffset moveto show +/vertoffset vertoffset printSize sub def +} forall +grestore +end +} dup 0 3 dict put def +/patternproc { +0 begin +/patternByteLength patternString length def +/patternHeight patternByteLength 8 mul sqrt cvi def +/patternWidth patternHeight def +/patternByteWidth patternWidth 8 idiv def +/imageByteMaxLength imageByteWidth imageHeight mul +stringLimit patternByteWidth sub min def +/imageMaxHeight imageByteMaxLength imageByteWidth idiv patternHeight idiv +patternHeight mul patternHeight max def +/imageHeight imageHeight imageMaxHeight sub store +/imageString imageByteWidth imageMaxHeight mul patternByteWidth add string def +0 1 imageMaxHeight 1 sub { +/y exch def +/patternRow y patternByteWidth mul patternByteLength mod def +/patternRowString patternString patternRow patternByteWidth getinterval def +/imageRow y imageByteWidth mul def +0 patternByteWidth imageByteWidth 1 sub { +/x exch def +imageString imageRow x add patternRowString putinterval +} for +} for +imageString +end +} dup 0 12 dict put def + +/min { +dup 3 2 roll dup 4 3 roll lt { exch } if pop +} def + +/max { +dup 3 2 roll dup 4 3 roll gt { exch } if pop +} def + +/midpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 x1 add 2 div +y0 y1 add 2 div +end +} dup 0 4 dict put def + +/thirdpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 2 mul x1 add 3 div +y0 2 mul y1 add 3 div +end +} dup 0 4 dict put def + +/subspline { +0 begin +/movetoNeeded exch def +y exch get /y3 exch def +x exch get /x3 exch def +y exch get /y2 exch def +x exch get /x2 exch def +y exch get /y1 exch def +x exch get /x1 exch def +y exch get /y0 exch def +x exch get /x0 exch def +x1 y1 x2 y2 thirdpoint +/p1y exch def +/p1x exch def +x2 y2 x1 y1 thirdpoint +/p2y exch def +/p2x exch def +x1 y1 x0 y0 thirdpoint +p1x p1y midpoint +/p0y exch def +/p0x exch def +x2 y2 x3 y3 thirdpoint +p2x p2y midpoint +/p3y exch def +/p3x exch def +movetoNeeded { p0x p0y moveto } if +p1x p1y p2x p2y p3x p3y curveto +end +} dup 0 17 dict put def + +/storexyn { +/n exch def +/y n array def +/x n array def +n 1 sub -1 0 { +/i exch def +y i 3 2 roll put +x i 3 2 roll put +} for +} def + +/SSten { +fgred fggreen fgblue setrgbcolor +dup true exch 1 0 0 -1 0 6 -1 roll matrix astore +} def + +/FSten { +dup 3 -1 roll dup 4 1 roll exch +newpath +0 0 moveto +dup 0 exch lineto +exch dup 3 1 roll exch lineto +0 lineto +closepath +bgred bggreen bgblue setrgbcolor +eofill +SSten +} def + +/Rast { +exch dup 3 1 roll 1 0 0 -1 0 6 -1 roll matrix astore +} def + +%%EndProlog + +%I Idraw 10 Grid 4.78495 4.78495 + +%%Page: 1 1 + +Begin +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1.16812e-08 -0.96 0.96 1.16812e-08 0 792 ] concat +/originalCTM matrix currentmatrix def + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.5 0 0 0.5 0.0165005 318.568 ] concat + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Blue +0 0 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.37618 0 0 1.96552 -499.801 15.7732 ] concat +%I +241 33 537 265 Rect +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 -34.4819 177.656 ] concat + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 -7.62939e-06 0 ] concat + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ 1.17448 0 0 1 -175.709 93.9789 ] concat +%I 7 +241 265 +241 249 +513 33 +537 33 +537 49 +265 265 +241 265 +7 Poly +End + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ -1.17448 0 0 1 738.037 93.9789 ] concat +%I 7 +241 265 +241 249 +513 33 +537 33 +537 49 +265 265 +241 265 +7 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.5 0 0 0.5 76.7339 81.4893 ] concat + +Begin %I Rect +%I b 65535 +3 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ 1.74715 0 0 2.07143 -47.1462 -474.522 ] concat +%I +241 273 281 497 Rect +End + +Begin %I Rect +%I b 65535 +3 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ 3.78192e-08 1.99185 -3.10809 2.42368e-08 1606.23 -196.895 ] concat +%I +241 273 281 497 Rect +End + +End %I eop + +End %I eop + +End %I eop + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 2.37618 0 0 1.96552 -499.801 15.7732 ] concat +%I +241 33 537 265 Rect +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.5 0 0 0.5 409.019 310.575 ] concat + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1.17448 0 0 1 126.985 737.979 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Blue +0 0 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2 0 0 2 -538 -713 ] concat +%I +241 33 537 265 Rect +End + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ 2 0 0 2 -538 -713 ] concat +%I 7 +241 265 +241 249 +513 33 +537 33 +537 49 +265 265 +241 265 +7 Poly +End + +Begin %I Poly +%I b 65535 +3 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ -2 0 0 2 1018 -713 ] concat +%I 7 +241 265 +241 249 +513 33 +537 33 +537 49 +265 265 +241 265 +7 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Rect +%I b 65535 +3 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ 1.74715 0 0 2.07143 -47.1462 -474.522 ] concat +%I +241 273 281 497 Rect +End + +Begin %I Rect +%I b 65535 +3 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg Red +1 0 0 SetCBg +%I p +1 SetP +%I t +[ 3.78192e-08 1.99185 -3.10809 2.42368e-08 1606.23 -196.895 ] concat +%I +241 273 281 497 Rect +End + +End %I eop + +End %I eop + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 1.17613 0 0 1 -70.3121 -6.021 ] concat +%I +112 97 704 561 Rect +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.500715 0 0 0.499249 -1.30695 21.2711 ] concat +%I +81 90 782 548 Rect +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.5 0 0 0.5 -0.74915 21.391 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 56.7763 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -84.037 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -224.85 ] concat +%I +344 521 624 561 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Red +1 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 2.50714 0 0 0.873834 -782.457 -365.664 ] concat +%I +344 521 624 561 Rect +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Rect +none SetB %I b n +%I cfg Blue +0 0 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.133803 0 0 0.133803 77.7863 182.363 ] concat +%I +-288 -80 848 841 Rect +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 26.7271 275.356 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 79.1779 275.356 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 26.7271 223.441 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 79.1779 223.441 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 131.629 275.356 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 131.629 223.441 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 26.7271 171.525 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 79.1779 171.525 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg White +1 1 1 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.0802818 0 0 0.0802818 131.629 171.525 ] concat +%I 11 +287 170 +275 133 +238 133 +268 111 +256 76 +286 98 +317 75 +306 112 +334 133 +299 133 +299 133 +11 Poly +End + +End %I eop + +End %I eop + +End %I eop + +End %I eop + +showpage + +%%Trailer + +end diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/demos/workstation/workstation.0 iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/workstation/workstation.0 --- iv-3.1/iv/src/examples/edraw/demos/workstation/workstation.0 Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/workstation/workstation.0 Tue Apr 2 13:52:32 1996 @@ -0,0 +1,2324 @@ +%!PS-Adobe-2.0 EPSF-1.2 +%%Creator: idraw +%%DocumentFonts: +%%Pages: 1 +%%BoundingBox: 182 288 428 513 +%%EndComments + +%%BeginIdrawPrologue +/arrowhead { +0 begin +transform originalCTM itransform +/taily exch def +/tailx exch def +transform originalCTM itransform +/tipy exch def +/tipx exch def +/dy tipy taily sub def +/dx tipx tailx sub def +/angle dx 0 ne dy 0 ne or { dy dx atan } { 90 } ifelse def +gsave +originalCTM setmatrix +tipx tipy translate +angle rotate +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +patternNone not { +originalCTM setmatrix +/padtip arrowHeight 2 exp 0.25 arrowWidth 2 exp mul add sqrt brushWidth mul +arrowWidth div def +/padtail brushWidth 2 div def +tipx tipy translate +angle rotate +padtip 0 translate +arrowHeight padtip add padtail add arrowHeight div dup scale +arrowheadpath +ifill +} if +brushNone not { +originalCTM setmatrix +tipx tipy translate +angle rotate +arrowheadpath +istroke +} if +grestore +end +} dup 0 9 dict put def + +/arrowheadpath { +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +} def + +/leftarrow { +0 begin +y exch get /taily exch def +x exch get /tailx exch def +y exch get /tipy exch def +x exch get /tipx exch def +brushLeftArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +/rightarrow { +0 begin +y exch get /tipy exch def +x exch get /tipx exch def +y exch get /taily exch def +x exch get /tailx exch def +brushRightArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +%%EndIdrawPrologue + +/arrowHeight 10 def +/arrowWidth 5 def + +/IdrawDict 50 dict def +IdrawDict begin + +/none null def +/numGraphicParameters 17 def +/stringLimit 65535 def + +/Begin { +save +numGraphicParameters dict begin +} def + +/End { +end +restore +} def + +/SetB { +dup type /nulltype eq { +pop +false /brushRightArrow idef +false /brushLeftArrow idef +true /brushNone idef +} { +/brushDashOffset idef +/brushDashArray idef +0 ne /brushRightArrow idef +0 ne /brushLeftArrow idef +/brushWidth idef +false /brushNone idef +} ifelse +} def + +/SetCFg { +/fgblue idef +/fggreen idef +/fgred idef +} def + +/SetCBg { +/bgblue idef +/bggreen idef +/bgred idef +} def + +/SetF { +/printSize idef +/printFont idef +} def + +/SetP { +dup type /nulltype eq { +pop true /patternNone idef +} { +dup -1 eq { +/patternGrayLevel idef +/patternString idef +} { +/patternGrayLevel idef +} ifelse +false /patternNone idef +} ifelse +} def + +/BSpl { +0 begin +storexyn +newpath +n 1 gt { +0 0 0 0 0 0 1 1 true subspline +n 2 gt { +0 0 0 0 1 1 2 2 false subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 2 copy false subspline +} if +n 2 sub dup n 1 sub dup 2 copy 2 copy false subspline +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Circ { +newpath +0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/CBSpl { +0 begin +dup 2 gt { +storexyn +newpath +n 1 sub dup 0 0 1 1 2 2 true subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 0 0 false subspline +n 2 sub dup n 1 sub dup 0 0 1 1 false subspline +patternNone not { ifill } if +brushNone not { istroke } if +} { +Poly +} ifelse +end +} dup 0 4 dict put def + +/Elli { +0 begin +newpath +4 2 roll +translate +scale +0 0 1 0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 1 dict put def + +/Line { +0 begin +2 storexyn +newpath +x 0 get y 0 get moveto +x 1 get y 1 get lineto +brushNone not { istroke } if +0 0 1 1 leftarrow +0 0 1 1 rightarrow +end +} dup 0 4 dict put def + +/MLine { +0 begin +storexyn +newpath +n 1 gt { +x 0 get y 0 get moveto +1 1 n 1 sub { +/i exch def +x i get y i get lineto +} for +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Poly { +3 1 roll +newpath +moveto +-1 add +{ lineto } repeat +closepath +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/Rect { +0 begin +/t exch def +/r exch def +/b exch def +/l exch def +newpath +l b moveto +l t lineto +r t lineto +r b lineto +closepath +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 4 dict put def + +/Text { +ishow +} def + +/idef { +dup where { pop pop pop } { exch def } ifelse +} def + +/ifill { +0 begin +gsave +patternGrayLevel -1 ne { +fgred bgred fgred sub patternGrayLevel mul add +fggreen bggreen fggreen sub patternGrayLevel mul add +fgblue bgblue fgblue sub patternGrayLevel mul add setrgbcolor +eofill +} { +eoclip +originalCTM setmatrix +pathbbox /t exch def /r exch def /b exch def /l exch def +/w r l sub ceiling cvi def +/h t b sub ceiling cvi def +/imageByteWidth w 8 div ceiling cvi def +/imageHeight h def +bgred bggreen bgblue setrgbcolor +eofill +fgred fggreen fgblue setrgbcolor +w 0 gt h 0 gt and { +l w add b translate w neg h scale +w h true [w 0 0 h neg 0 h] { patternproc } imagemask +} if +} ifelse +grestore +end +} dup 0 8 dict put def + +/istroke { +gsave +brushDashOffset -1 eq { +[] 0 setdash +1 setgray +} { +brushDashArray brushDashOffset setdash +fgred fggreen fgblue setrgbcolor +} ifelse +brushWidth setlinewidth +originalCTM setmatrix +stroke +grestore +} def + +/ishow { +0 begin +gsave +fgred fggreen fgblue setrgbcolor +/fontDict printFont printSize scalefont dup setfont def +/descender fontDict begin 0 [FontBBox] 1 get FontMatrix end +transform exch pop def +/vertoffset 1 printSize sub descender sub def { +0 vertoffset moveto show +/vertoffset vertoffset printSize sub def +} forall +grestore +end +} dup 0 3 dict put def +/patternproc { +0 begin +/patternByteLength patternString length def +/patternHeight patternByteLength 8 mul sqrt cvi def +/patternWidth patternHeight def +/patternByteWidth patternWidth 8 idiv def +/imageByteMaxLength imageByteWidth imageHeight mul +stringLimit patternByteWidth sub min def +/imageMaxHeight imageByteMaxLength imageByteWidth idiv patternHeight idiv +patternHeight mul patternHeight max def +/imageHeight imageHeight imageMaxHeight sub store +/imageString imageByteWidth imageMaxHeight mul patternByteWidth add string def +0 1 imageMaxHeight 1 sub { +/y exch def +/patternRow y patternByteWidth mul patternByteLength mod def +/patternRowString patternString patternRow patternByteWidth getinterval def +/imageRow y imageByteWidth mul def +0 patternByteWidth imageByteWidth 1 sub { +/x exch def +imageString imageRow x add patternRowString putinterval +} for +} for +imageString +end +} dup 0 12 dict put def + +/min { +dup 3 2 roll dup 4 3 roll lt { exch } if pop +} def + +/max { +dup 3 2 roll dup 4 3 roll gt { exch } if pop +} def + +/midpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 x1 add 2 div +y0 y1 add 2 div +end +} dup 0 4 dict put def + +/thirdpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 2 mul x1 add 3 div +y0 2 mul y1 add 3 div +end +} dup 0 4 dict put def + +/subspline { +0 begin +/movetoNeeded exch def +y exch get /y3 exch def +x exch get /x3 exch def +y exch get /y2 exch def +x exch get /x2 exch def +y exch get /y1 exch def +x exch get /x1 exch def +y exch get /y0 exch def +x exch get /x0 exch def +x1 y1 x2 y2 thirdpoint +/p1y exch def +/p1x exch def +x2 y2 x1 y1 thirdpoint +/p2y exch def +/p2x exch def +x1 y1 x0 y0 thirdpoint +p1x p1y midpoint +/p0y exch def +/p0x exch def +x2 y2 x3 y3 thirdpoint +p2x p2y midpoint +/p3y exch def +/p3x exch def +movetoNeeded { p0x p0y moveto } if +p1x p1y p2x p2y p3x p3y curveto +end +} dup 0 17 dict put def + +/storexyn { +/n exch def +/y n array def +/x n array def +n 1 sub -1 0 { +/i exch def +y i 3 2 roll put +x i 3 2 roll put +} for +} def + +/SSten { +fgred fggreen fgblue setrgbcolor +dup true exch 1 0 0 -1 0 6 -1 roll matrix astore +} def + +/FSten { +dup 3 -1 roll dup 4 1 roll exch +newpath +0 0 moveto +dup 0 exch lineto +exch dup 3 1 roll exch lineto +0 lineto +closepath +bgred bggreen bgblue setrgbcolor +eofill +SSten +} def + +/Rast { +exch dup 3 1 roll 1 0 0 -1 0 6 -1 roll matrix astore +} def + +%%EndProlog + +%I Idraw 10 Grid 4.78495 4.78495 + +%%Page: 1 1 + +Begin +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.923077 0 0 0.923077 0 0 ] concat +/originalCTM matrix currentmatrix def + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I BSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 1 0 0 1 -51.199 154.142 ] concat +%I 5 +322 287 +252 245 +308 217 +273 182 +343 189 +5 BSpl +%I 1 +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1.58324 0 0 0.820513 -98.495 211.757 ] concat + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.916667 0 0 1 -80.5 -80 ] concat +%I 4 +308 245 +294 210 +462 210 +447 245 +4 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.833333 0 0 0.833333 -49 -42.0833 ] concat +%I 4 +308 245 +294 210 +462 210 +448 245 +4 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.833333 0 0 0.833333 -49 -40.0833 ] concat +%I 4 +308 245 +294 210 +462 210 +448 245 +4 Poly +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 0.816164 0 0 0.5 -50.9522 24 ] concat +%I +294 203 483 210 Rect +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +438 221 304 221 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +436 227 306 227 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +434 233 309 233 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +431 239 311 239 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +320 244 309 215 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +326 244 317 215 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +333 244 327 221 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +340 244 335 221 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +346 244 342 221 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -104 -80 ] concat +%I +351 244 349 221 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -104 -80 ] concat +%I +358 244 357 221 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +365 244 365 221 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +372 244 373 221 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +380 244 383 215 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +387 244 392 215 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -103 -80 ] concat +%I +393 244 399 215 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +402 245 408 221 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -104 -80 ] concat +%I +409 244 416 221 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +418 244 428 215 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -112 -84 ] concat +%I +316 219 316 217 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -112 -84 ] concat +%I +324 219 324 217 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -112 -84 ] concat +%I +390 219 390 217 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -112 -84 ] concat +%I +399 219 399 217 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -112 -84 ] concat +%I +408 219 408 217 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -112 -84 ] concat +%I +435 219 435 217 Line +%I 1 +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I BSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 1 0 0 1 -51.199 154.142 ] concat +%I 4 +455 287 +511 259 +462 259 +497 238 +4 BSpl +%I 1 +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.215686 0 0 0.215686 402.958 332.515 ] concat + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1.57895 0 0 1.32331 -91.2368 -87.1316 ] concat + +Begin %I MLine +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I 7 +98 308 +98 280 +147 231 +147 259 +147 231 +231 231 +231 259 +7 MLine +%I 1 +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 0 14 ] concat +%I 4 +98 294 +147 245 +231 245 +175 294 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.25 0 0 0.25 67.375 267.75 ] concat + +Begin %I MLine +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I 7 +112 189 +112 161 +196 77 +196 105 +196 77 +273 77 +273 105 +7 MLine +%I 1 +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 14 -105 ] concat +%I 4 +98 294 +182 210 +259 210 +175 294 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.25 0 0 0.25 102.375 267.75 ] concat + +Begin %I MLine +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I 7 +112 189 +112 161 +196 77 +196 105 +196 77 +273 77 +273 105 +7 MLine +%I 1 +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 14 -105 ] concat +%I 4 +98 294 +182 210 +259 210 +175 294 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.25 0 0 0.25 137.375 267.75 ] concat + +Begin %I MLine +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I 7 +112 189 +112 161 +196 77 +196 105 +196 77 +273 77 +273 105 +7 MLine +%I 1 +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 14 -105 ] concat +%I 4 +98 294 +182 210 +259 210 +175 294 +4 Poly +End + +End %I eop + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 186.801 301.142 ] concat + +Begin %I MLine +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 -238 -147 ] concat +%I 4 +315 280 +294 238 +462 238 +441 280 +4 MLine +%I 1 +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 -238 -140 ] concat +%I +343 245 413 259 Rect +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 -238 -147 ] concat +%I 12 +308 399 +294 399 +294 385 +294 273 +294 259 +308 259 +448 259 +462 259 +462 280 +462 385 +462 399 +448 399 +12 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.75 SetP +%I t +[ 1 0 0 1 -84 -126 ] concat +%I 16 +196 364 +154 364 +154 332 +154 308 +154 284 +154 252 +196 252 +224 252 +252 252 +294 252 +294 284 +294 308 +294 332 +294 364 +252 364 +224 364 +16 CBSpl +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 1.08571 0 0 1.08571 -270.4 -175.2 ] concat +%I +308 273 448 385 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 1 0 0 1 -238 -147 ] concat +%I +308 273 448 385 Rect +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.0833333 0 0 0.0833333 149.5 117.333 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 6 0 0 6 -630 -1120 ] concat +%I +119 217 133 231 Rect +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +< 11 22 44 88 11 22 44 88 > -1 SetP +%I t +[ 1 0 0 1 7 -14 ] concat +%I +105 252 14 14 Elli +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +< cc cc 33 33 cc cc 33 33 > -1 SetP +%I t u +%I +133 196 154 217 Rect +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +126 238 140 238 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +140 238 140 217 Line +%I 1 +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1.014e-09 -0.0833333 0.0833333 1.014e-09 155.333 148.5 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 6 0 0 6 -630 -1120 ] concat +%I +119 217 133 231 Rect +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +< 11 22 44 88 11 22 44 88 > -1 SetP +%I t +[ 1 0 0 1 7 -14 ] concat +%I +105 252 14 14 Elli +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +< cc cc 33 33 cc cc 33 33 > -1 SetP +%I t u +%I +133 196 154 217 Rect +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +126 238 140 238 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +140 238 140 217 Line +%I 1 +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1.014e-09 0.0833333 -0.0833333 1.014e-09 203.667 126.5 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 6 0 0 6 -630 -1120 ] concat +%I +119 217 133 231 Rect +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +< 11 22 44 88 11 22 44 88 > -1 SetP +%I t +[ 1 0 0 1 7 -14 ] concat +%I +105 252 14 14 Elli +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +< cc cc 33 33 cc cc 33 33 > -1 SetP +%I t u +%I +133 196 154 217 Rect +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +126 238 140 238 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +140 238 140 217 Line +%I 1 +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.272727 0 0 0.272727 126.636 81.455 ] concat + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +77 266 252 420 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t u +%I +77 406 252 420 Rect +End + +End %I eop + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +77 266 105 406 Rect +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +77 392 105 392 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 0 -14 ] concat +%I +77 392 105 392 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 0 -28 ] concat +%I +77 392 105 392 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 0 -42 ] concat +%I +77 392 105 392 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 0 -56 ] concat +%I +77 392 105 392 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 0 -70 ] concat +%I +77 392 105 392 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 0 -84 ] concat +%I +77 392 105 392 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 0 -98 ] concat +%I +77 392 105 392 Line +%I 1 +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t u +%I +245 266 252 406 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t u +%I +105 266 252 273 Rect +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t u +%I +175 357 231 357 Line +%I 1 +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 1.33333 0 0 1 -88.6667 0 ] concat +%I +224 329 245 343 Rect +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t u +%I +224 357 224 343 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t u +%I +154 343 154 273 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 1 0 0 1 -7 0 ] concat +%I +168 350 210 294 Line +%I 1 +End + +Begin %I Elli +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +154 357 21 14 Elli +End + +End %I eop + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 -238 -147 ] concat +%I +294 231 462 238 Rect +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.205714 0 0 0.205714 74.66 139.44 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +77 266 252 420 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t u +%I +77 406 252 420 Rect +End + +End %I eop + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 1 0 0 1 1 -1 ] concat +%I +91 222 97 222 Line +%I 1 +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.205714 0 0 0.205714 88.66 125.44 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +77 266 252 420 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t u +%I +77 406 252 420 Rect +End + +End %I eop + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.205714 0 0 0.205714 88.66 118.24 ] concat +%I +84 392 175 392 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.205714 0 0 0.205714 88.66 121.12 ] concat +%I +84 392 175 392 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.205714 0 0 0.205714 88.66 124 ] concat +%I +84 392 175 392 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.205714 0 0 0.205714 88.66 126.88 ] concat +%I +84 392 175 392 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.205714 0 0 0.205714 88.66 109.6 ] concat +%I +84 392 175 392 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.205714 0 0 0.205714 88.66 112.48 ] concat +%I +84 392 175 392 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.205714 0 0 0.205714 88.66 115.36 ] concat +%I +84 392 175 392 Line +%I 1 +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.205714 0 0 0.205714 74.66 97.44 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +77 266 252 420 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t u +%I +77 406 252 420 Rect +End + +End %I eop + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.205714 0 0 0.205714 74.66 90.24 ] concat +%I +84 392 175 392 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.205714 0 0 0.205714 74.66 93.12 ] concat +%I +84 392 175 392 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.205714 0 0 0.205714 74.66 96 ] concat +%I +84 392 175 392 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.205714 0 0 0.205714 74.66 97.44 ] concat +%I +84 392 175 392 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.205714 0 0 0.205714 74.66 98.88 ] concat +%I +84 392 175 392 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.205714 0 0 0.205714 74.66 81.6 ] concat +%I +84 392 175 392 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t +[ 0.205714 0 0 0.205714 74.66 84.48 ] concat +%I +84 392 175 392 Line +%I 1 +End + +End %I eop + +End %I eop + +End %I eop + +showpage + +%%Trailer + +end diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/demos/workstation/workstation.1 iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/workstation/workstation.1 --- iv-3.1/iv/src/examples/edraw/demos/workstation/workstation.1 Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/workstation/workstation.1 Tue Apr 2 13:52:32 1996 @@ -0,0 +1,1316 @@ +%!PS-Adobe-2.0 EPSF-1.2 +%%Creator: idraw +%%DocumentFonts: +%%Pages: 1 +%%BoundingBox: 182 288 428 513 +%%EndComments + +%%BeginIdrawPrologue +/arrowhead { +0 begin +transform originalCTM itransform +/taily exch def +/tailx exch def +transform originalCTM itransform +/tipy exch def +/tipx exch def +/dy tipy taily sub def +/dx tipx tailx sub def +/angle dx 0 ne dy 0 ne or { dy dx atan } { 90 } ifelse def +gsave +originalCTM setmatrix +tipx tipy translate +angle rotate +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +patternNone not { +originalCTM setmatrix +/padtip arrowHeight 2 exp 0.25 arrowWidth 2 exp mul add sqrt brushWidth mul +arrowWidth div def +/padtail brushWidth 2 div def +tipx tipy translate +angle rotate +padtip 0 translate +arrowHeight padtip add padtail add arrowHeight div dup scale +arrowheadpath +ifill +} if +brushNone not { +originalCTM setmatrix +tipx tipy translate +angle rotate +arrowheadpath +istroke +} if +grestore +end +} dup 0 9 dict put def + +/arrowheadpath { +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +} def + +/leftarrow { +0 begin +y exch get /taily exch def +x exch get /tailx exch def +y exch get /tipy exch def +x exch get /tipx exch def +brushLeftArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +/rightarrow { +0 begin +y exch get /tipy exch def +x exch get /tipx exch def +y exch get /taily exch def +x exch get /tailx exch def +brushRightArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +%%EndIdrawPrologue + +/arrowHeight 10 def +/arrowWidth 5 def + +/IdrawDict 50 dict def +IdrawDict begin + +/none null def +/numGraphicParameters 17 def +/stringLimit 65535 def + +/Begin { +save +numGraphicParameters dict begin +} def + +/End { +end +restore +} def + +/SetB { +dup type /nulltype eq { +pop +false /brushRightArrow idef +false /brushLeftArrow idef +true /brushNone idef +} { +/brushDashOffset idef +/brushDashArray idef +0 ne /brushRightArrow idef +0 ne /brushLeftArrow idef +/brushWidth idef +false /brushNone idef +} ifelse +} def + +/SetCFg { +/fgblue idef +/fggreen idef +/fgred idef +} def + +/SetCBg { +/bgblue idef +/bggreen idef +/bgred idef +} def + +/SetF { +/printSize idef +/printFont idef +} def + +/SetP { +dup type /nulltype eq { +pop true /patternNone idef +} { +dup -1 eq { +/patternGrayLevel idef +/patternString idef +} { +/patternGrayLevel idef +} ifelse +false /patternNone idef +} ifelse +} def + +/BSpl { +0 begin +storexyn +newpath +n 1 gt { +0 0 0 0 0 0 1 1 true subspline +n 2 gt { +0 0 0 0 1 1 2 2 false subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 2 copy false subspline +} if +n 2 sub dup n 1 sub dup 2 copy 2 copy false subspline +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Circ { +newpath +0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/CBSpl { +0 begin +dup 2 gt { +storexyn +newpath +n 1 sub dup 0 0 1 1 2 2 true subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 0 0 false subspline +n 2 sub dup n 1 sub dup 0 0 1 1 false subspline +patternNone not { ifill } if +brushNone not { istroke } if +} { +Poly +} ifelse +end +} dup 0 4 dict put def + +/Elli { +0 begin +newpath +4 2 roll +translate +scale +0 0 1 0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 1 dict put def + +/Line { +0 begin +2 storexyn +newpath +x 0 get y 0 get moveto +x 1 get y 1 get lineto +brushNone not { istroke } if +0 0 1 1 leftarrow +0 0 1 1 rightarrow +end +} dup 0 4 dict put def + +/MLine { +0 begin +storexyn +newpath +n 1 gt { +x 0 get y 0 get moveto +1 1 n 1 sub { +/i exch def +x i get y i get lineto +} for +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Poly { +3 1 roll +newpath +moveto +-1 add +{ lineto } repeat +closepath +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/Rect { +0 begin +/t exch def +/r exch def +/b exch def +/l exch def +newpath +l b moveto +l t lineto +r t lineto +r b lineto +closepath +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 4 dict put def + +/Text { +ishow +} def + +/idef { +dup where { pop pop pop } { exch def } ifelse +} def + +/ifill { +0 begin +gsave +patternGrayLevel -1 ne { +fgred bgred fgred sub patternGrayLevel mul add +fggreen bggreen fggreen sub patternGrayLevel mul add +fgblue bgblue fgblue sub patternGrayLevel mul add setrgbcolor +eofill +} { +eoclip +originalCTM setmatrix +pathbbox /t exch def /r exch def /b exch def /l exch def +/w r l sub ceiling cvi def +/h t b sub ceiling cvi def +/imageByteWidth w 8 div ceiling cvi def +/imageHeight h def +bgred bggreen bgblue setrgbcolor +eofill +fgred fggreen fgblue setrgbcolor +w 0 gt h 0 gt and { +l w add b translate w neg h scale +w h true [w 0 0 h neg 0 h] { patternproc } imagemask +} if +} ifelse +grestore +end +} dup 0 8 dict put def + +/istroke { +gsave +brushDashOffset -1 eq { +[] 0 setdash +1 setgray +} { +brushDashArray brushDashOffset setdash +fgred fggreen fgblue setrgbcolor +} ifelse +brushWidth setlinewidth +originalCTM setmatrix +stroke +grestore +} def + +/ishow { +0 begin +gsave +fgred fggreen fgblue setrgbcolor +/fontDict printFont printSize scalefont dup setfont def +/descender fontDict begin 0 [FontBBox] 1 get FontMatrix end +transform exch pop def +/vertoffset 1 printSize sub descender sub def { +0 vertoffset moveto show +/vertoffset vertoffset printSize sub def +} forall +grestore +end +} dup 0 3 dict put def +/patternproc { +0 begin +/patternByteLength patternString length def +/patternHeight patternByteLength 8 mul sqrt cvi def +/patternWidth patternHeight def +/patternByteWidth patternWidth 8 idiv def +/imageByteMaxLength imageByteWidth imageHeight mul +stringLimit patternByteWidth sub min def +/imageMaxHeight imageByteMaxLength imageByteWidth idiv patternHeight idiv +patternHeight mul patternHeight max def +/imageHeight imageHeight imageMaxHeight sub store +/imageString imageByteWidth imageMaxHeight mul patternByteWidth add string def +0 1 imageMaxHeight 1 sub { +/y exch def +/patternRow y patternByteWidth mul patternByteLength mod def +/patternRowString patternString patternRow patternByteWidth getinterval def +/imageRow y imageByteWidth mul def +0 patternByteWidth imageByteWidth 1 sub { +/x exch def +imageString imageRow x add patternRowString putinterval +} for +} for +imageString +end +} dup 0 12 dict put def + +/min { +dup 3 2 roll dup 4 3 roll lt { exch } if pop +} def + +/max { +dup 3 2 roll dup 4 3 roll gt { exch } if pop +} def + +/midpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 x1 add 2 div +y0 y1 add 2 div +end +} dup 0 4 dict put def + +/thirdpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 2 mul x1 add 3 div +y0 2 mul y1 add 3 div +end +} dup 0 4 dict put def + +/subspline { +0 begin +/movetoNeeded exch def +y exch get /y3 exch def +x exch get /x3 exch def +y exch get /y2 exch def +x exch get /x2 exch def +y exch get /y1 exch def +x exch get /x1 exch def +y exch get /y0 exch def +x exch get /x0 exch def +x1 y1 x2 y2 thirdpoint +/p1y exch def +/p1x exch def +x2 y2 x1 y1 thirdpoint +/p2y exch def +/p2x exch def +x1 y1 x0 y0 thirdpoint +p1x p1y midpoint +/p0y exch def +/p0x exch def +x2 y2 x3 y3 thirdpoint +p2x p2y midpoint +/p3y exch def +/p3x exch def +movetoNeeded { p0x p0y moveto } if +p1x p1y p2x p2y p3x p3y curveto +end +} dup 0 17 dict put def + +/storexyn { +/n exch def +/y n array def +/x n array def +n 1 sub -1 0 { +/i exch def +y i 3 2 roll put +x i 3 2 roll put +} for +} def + +/SSten { +fgred fggreen fgblue setrgbcolor +dup true exch 1 0 0 -1 0 6 -1 roll matrix astore +} def + +/FSten { +dup 3 -1 roll dup 4 1 roll exch +newpath +0 0 moveto +dup 0 exch lineto +exch dup 3 1 roll exch lineto +0 lineto +closepath +bgred bggreen bgblue setrgbcolor +eofill +SSten +} def + +/Rast { +exch dup 3 1 roll 1 0 0 -1 0 6 -1 roll matrix astore +} def + +%%EndProlog + +%I Idraw 10 Grid 4.78495 4.78495 + +%%Page: 1 1 + +Begin +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.923077 0 0 0.923077 0 0 ] concat +/originalCTM matrix currentmatrix def + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I BSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 1 0 0 1 -51.199 154.142 ] concat +%I 5 +322 287 +252 245 +308 217 +273 182 +343 189 +5 BSpl +%I 1 +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1.58324 0 0 0.820513 -98.495 211.757 ] concat + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.916667 0 0 1 -80.5 -80 ] concat +%I 4 +308 245 +294 210 +462 210 +447 245 +4 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.833333 0 0 0.833333 -49 -40.0833 ] concat +%I 4 +308 245 +294 210 +462 210 +448 245 +4 Poly +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 0.816164 0 0 0.5 -50.9522 24 ] concat +%I +294 203 483 210 Rect +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +438 221 304 221 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +436 227 306 227 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +431 239 311 239 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +333 244 327 221 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +346 244 342 221 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -104 -80 ] concat +%I +358 244 357 221 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +372 244 373 221 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +402 245 408 221 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -104 -80 ] concat +%I +409 244 416 221 Line +%I 1 +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I BSpl +%I b 65535 +3 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 1 0 0 1 -51.199 154.142 ] concat +%I 4 +455 287 +511 259 +462 259 +497 238 +4 BSpl +%I 1 +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.215686 0 0 0.215686 402.958 332.515 ] concat + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1.57895 0 0 1.32331 -91.2368 -87.1316 ] concat + +Begin %I MLine +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I 7 +98 308 +98 280 +147 231 +147 259 +147 231 +231 231 +231 259 +7 MLine +%I 1 +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 0 14 ] concat +%I 4 +98 294 +147 245 +231 245 +175 294 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.25 0 0 0.25 67.375 267.75 ] concat + +Begin %I MLine +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I 7 +112 189 +112 161 +196 77 +196 105 +196 77 +273 77 +273 105 +7 MLine +%I 1 +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 14 -105 ] concat +%I 4 +98 294 +182 210 +259 210 +175 294 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.25 0 0 0.25 102.375 267.75 ] concat + +Begin %I MLine +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I 7 +112 189 +112 161 +196 77 +196 105 +196 77 +273 77 +273 105 +7 MLine +%I 1 +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 14 -105 ] concat +%I 4 +98 294 +182 210 +259 210 +175 294 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.25 0 0 0.25 137.375 267.75 ] concat + +Begin %I MLine +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I 7 +112 189 +112 161 +196 77 +196 105 +196 77 +273 77 +273 105 +7 MLine +%I 1 +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 14 -105 ] concat +%I 4 +98 294 +182 210 +259 210 +175 294 +4 Poly +End + +End %I eop + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 186.801 301.142 ] concat + +Begin %I MLine +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 -238 -147 ] concat +%I 4 +315 280 +294 238 +462 238 +441 280 +4 MLine +%I 1 +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 -238 -140 ] concat +%I +343 245 413 259 Rect +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 -238 -147 ] concat +%I 12 +308 399 +294 399 +294 385 +294 273 +294 259 +308 259 +448 259 +462 259 +462 280 +462 385 +462 399 +448 399 +12 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.75 SetP +%I t +[ 1 0 0 1 -84 -126 ] concat +%I 16 +196 364 +154 364 +154 332 +154 308 +154 284 +154 252 +196 252 +224 252 +252 252 +294 252 +294 284 +294 308 +294 332 +294 364 +252 364 +224 364 +16 CBSpl +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 1.08571 0 0 1.08571 -270.4 -175.2 ] concat +%I +308 273 448 385 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 1 0 0 1 -238 -147 ] concat +%I +308 273 448 385 Rect +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.272727 0 0 0.272727 126.636 81.455 ] concat + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +77 266 252 420 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t u +%I +77 406 252 420 Rect +End + +End %I eop + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +77 266 105 406 Rect +End + +End %I eop + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 -238 -147 ] concat +%I +294 231 462 238 Rect +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.205714 0 0 0.205714 74.66 139.44 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +77 266 252 420 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t u +%I +77 406 252 420 Rect +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.205714 0 0 0.205714 88.66 125.44 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +77 266 252 420 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t u +%I +77 406 252 420 Rect +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.205714 0 0 0.205714 74.66 97.44 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +77 266 252 420 Rect +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0 SetP +%I t u +%I +77 406 252 420 Rect +End + +End %I eop + +End %I eop + +End %I eop + +End %I eop + +showpage + +%%Trailer + +end diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/demos/workstation/workstation.2 iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/workstation/workstation.2 --- iv-3.1/iv/src/examples/edraw/demos/workstation/workstation.2 Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/demos/workstation/workstation.2 Tue Apr 2 13:52:32 1996 @@ -0,0 +1,1056 @@ +%!PS-Adobe-2.0 EPSF-1.2 +%%Creator: idraw +%%DocumentFonts: +%%Pages: 1 +%%BoundingBox: 184 289 427 511 +%%EndComments + +%%BeginIdrawPrologue +/arrowhead { +0 begin +transform originalCTM itransform +/taily exch def +/tailx exch def +transform originalCTM itransform +/tipy exch def +/tipx exch def +/dy tipy taily sub def +/dx tipx tailx sub def +/angle dx 0 ne dy 0 ne or { dy dx atan } { 90 } ifelse def +gsave +originalCTM setmatrix +tipx tipy translate +angle rotate +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +patternNone not { +originalCTM setmatrix +/padtip arrowHeight 2 exp 0.25 arrowWidth 2 exp mul add sqrt brushWidth mul +arrowWidth div def +/padtail brushWidth 2 div def +tipx tipy translate +angle rotate +padtip 0 translate +arrowHeight padtip add padtail add arrowHeight div dup scale +arrowheadpath +ifill +} if +brushNone not { +originalCTM setmatrix +tipx tipy translate +angle rotate +arrowheadpath +istroke +} if +grestore +end +} dup 0 9 dict put def + +/arrowheadpath { +newpath +arrowHeight neg arrowWidth 2 div moveto +0 0 lineto +arrowHeight neg arrowWidth 2 div neg lineto +} def + +/leftarrow { +0 begin +y exch get /taily exch def +x exch get /tailx exch def +y exch get /tipy exch def +x exch get /tipx exch def +brushLeftArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +/rightarrow { +0 begin +y exch get /tipy exch def +x exch get /tipx exch def +y exch get /taily exch def +x exch get /tailx exch def +brushRightArrow { tipx tipy tailx taily arrowhead } if +end +} dup 0 4 dict put def + +%%EndIdrawPrologue + +/arrowHeight 10 def +/arrowWidth 5 def + +/IdrawDict 50 dict def +IdrawDict begin + +/none null def +/numGraphicParameters 17 def +/stringLimit 65535 def + +/Begin { +save +numGraphicParameters dict begin +} def + +/End { +end +restore +} def + +/SetB { +dup type /nulltype eq { +pop +false /brushRightArrow idef +false /brushLeftArrow idef +true /brushNone idef +} { +/brushDashOffset idef +/brushDashArray idef +0 ne /brushRightArrow idef +0 ne /brushLeftArrow idef +/brushWidth idef +false /brushNone idef +} ifelse +} def + +/SetCFg { +/fgblue idef +/fggreen idef +/fgred idef +} def + +/SetCBg { +/bgblue idef +/bggreen idef +/bgred idef +} def + +/SetF { +/printSize idef +/printFont idef +} def + +/SetP { +dup type /nulltype eq { +pop true /patternNone idef +} { +dup -1 eq { +/patternGrayLevel idef +/patternString idef +} { +/patternGrayLevel idef +} ifelse +false /patternNone idef +} ifelse +} def + +/BSpl { +0 begin +storexyn +newpath +n 1 gt { +0 0 0 0 0 0 1 1 true subspline +n 2 gt { +0 0 0 0 1 1 2 2 false subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 2 copy false subspline +} if +n 2 sub dup n 1 sub dup 2 copy 2 copy false subspline +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Circ { +newpath +0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/CBSpl { +0 begin +dup 2 gt { +storexyn +newpath +n 1 sub dup 0 0 1 1 2 2 true subspline +1 1 n 3 sub { +/i exch def +i 1 sub dup i dup i 1 add dup i 2 add dup false subspline +} for +n 3 sub dup n 2 sub dup n 1 sub dup 0 0 false subspline +n 2 sub dup n 1 sub dup 0 0 1 1 false subspline +patternNone not { ifill } if +brushNone not { istroke } if +} { +Poly +} ifelse +end +} dup 0 4 dict put def + +/Elli { +0 begin +newpath +4 2 roll +translate +scale +0 0 1 0 360 arc +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 1 dict put def + +/Line { +0 begin +2 storexyn +newpath +x 0 get y 0 get moveto +x 1 get y 1 get lineto +brushNone not { istroke } if +0 0 1 1 leftarrow +0 0 1 1 rightarrow +end +} dup 0 4 dict put def + +/MLine { +0 begin +storexyn +newpath +n 1 gt { +x 0 get y 0 get moveto +1 1 n 1 sub { +/i exch def +x i get y i get lineto +} for +patternNone not brushLeftArrow not brushRightArrow not and and { ifill } if +brushNone not { istroke } if +0 0 1 1 leftarrow +n 2 sub dup n 1 sub dup rightarrow +} if +end +} dup 0 4 dict put def + +/Poly { +3 1 roll +newpath +moveto +-1 add +{ lineto } repeat +closepath +patternNone not { ifill } if +brushNone not { istroke } if +} def + +/Rect { +0 begin +/t exch def +/r exch def +/b exch def +/l exch def +newpath +l b moveto +l t lineto +r t lineto +r b lineto +closepath +patternNone not { ifill } if +brushNone not { istroke } if +end +} dup 0 4 dict put def + +/Text { +ishow +} def + +/idef { +dup where { pop pop pop } { exch def } ifelse +} def + +/ifill { +0 begin +gsave +patternGrayLevel -1 ne { +fgred bgred fgred sub patternGrayLevel mul add +fggreen bggreen fggreen sub patternGrayLevel mul add +fgblue bgblue fgblue sub patternGrayLevel mul add setrgbcolor +eofill +} { +eoclip +originalCTM setmatrix +pathbbox /t exch def /r exch def /b exch def /l exch def +/w r l sub ceiling cvi def +/h t b sub ceiling cvi def +/imageByteWidth w 8 div ceiling cvi def +/imageHeight h def +bgred bggreen bgblue setrgbcolor +eofill +fgred fggreen fgblue setrgbcolor +w 0 gt h 0 gt and { +l w add b translate w neg h scale +w h true [w 0 0 h neg 0 h] { patternproc } imagemask +} if +} ifelse +grestore +end +} dup 0 8 dict put def + +/istroke { +gsave +brushDashOffset -1 eq { +[] 0 setdash +1 setgray +} { +brushDashArray brushDashOffset setdash +fgred fggreen fgblue setrgbcolor +} ifelse +brushWidth setlinewidth +originalCTM setmatrix +stroke +grestore +} def + +/ishow { +0 begin +gsave +fgred fggreen fgblue setrgbcolor +/fontDict printFont printSize scalefont dup setfont def +/descender fontDict begin 0 [FontBBox] 1 get FontMatrix end +transform exch pop def +/vertoffset 1 printSize sub descender sub def { +0 vertoffset moveto show +/vertoffset vertoffset printSize sub def +} forall +grestore +end +} dup 0 3 dict put def +/patternproc { +0 begin +/patternByteLength patternString length def +/patternHeight patternByteLength 8 mul sqrt cvi def +/patternWidth patternHeight def +/patternByteWidth patternWidth 8 idiv def +/imageByteMaxLength imageByteWidth imageHeight mul +stringLimit patternByteWidth sub min def +/imageMaxHeight imageByteMaxLength imageByteWidth idiv patternHeight idiv +patternHeight mul patternHeight max def +/imageHeight imageHeight imageMaxHeight sub store +/imageString imageByteWidth imageMaxHeight mul patternByteWidth add string def +0 1 imageMaxHeight 1 sub { +/y exch def +/patternRow y patternByteWidth mul patternByteLength mod def +/patternRowString patternString patternRow patternByteWidth getinterval def +/imageRow y imageByteWidth mul def +0 patternByteWidth imageByteWidth 1 sub { +/x exch def +imageString imageRow x add patternRowString putinterval +} for +} for +imageString +end +} dup 0 12 dict put def + +/min { +dup 3 2 roll dup 4 3 roll lt { exch } if pop +} def + +/max { +dup 3 2 roll dup 4 3 roll gt { exch } if pop +} def + +/midpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 x1 add 2 div +y0 y1 add 2 div +end +} dup 0 4 dict put def + +/thirdpoint { +0 begin +/y1 exch def +/x1 exch def +/y0 exch def +/x0 exch def +x0 2 mul x1 add 3 div +y0 2 mul y1 add 3 div +end +} dup 0 4 dict put def + +/subspline { +0 begin +/movetoNeeded exch def +y exch get /y3 exch def +x exch get /x3 exch def +y exch get /y2 exch def +x exch get /x2 exch def +y exch get /y1 exch def +x exch get /x1 exch def +y exch get /y0 exch def +x exch get /x0 exch def +x1 y1 x2 y2 thirdpoint +/p1y exch def +/p1x exch def +x2 y2 x1 y1 thirdpoint +/p2y exch def +/p2x exch def +x1 y1 x0 y0 thirdpoint +p1x p1y midpoint +/p0y exch def +/p0x exch def +x2 y2 x3 y3 thirdpoint +p2x p2y midpoint +/p3y exch def +/p3x exch def +movetoNeeded { p0x p0y moveto } if +p1x p1y p2x p2y p3x p3y curveto +end +} dup 0 17 dict put def + +/storexyn { +/n exch def +/y n array def +/x n array def +n 1 sub -1 0 { +/i exch def +y i 3 2 roll put +x i 3 2 roll put +} for +} def + +/SSten { +fgred fggreen fgblue setrgbcolor +dup true exch 1 0 0 -1 0 6 -1 roll matrix astore +} def + +/FSten { +dup 3 -1 roll dup 4 1 roll exch +newpath +0 0 moveto +dup 0 exch lineto +exch dup 3 1 roll exch lineto +0 lineto +closepath +bgred bggreen bgblue setrgbcolor +eofill +SSten +} def + +/Rast { +exch dup 3 1 roll 1 0 0 -1 0 6 -1 roll matrix astore +} def + +%%EndProlog + +%I Idraw 10 Grid 4.78495 4.78495 + +%%Page: 1 1 + +Begin +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.923077 0 0 0.923077 0 0 ] concat +/originalCTM matrix currentmatrix def + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I BSpl +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 1 0 0 1 -51.199 154.142 ] concat +%I 5 +322 287 +252 245 +308 217 +273 182 +343 189 +5 BSpl +%I 1 +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1.58324 0 0 0.820513 -98.495 211.757 ] concat + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.916667 0 0 1 -80.5 -80 ] concat +%I 4 +308 245 +294 210 +462 210 +447 245 +4 Poly +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 0.833333 0 0 0.833333 -49 -40.0833 ] concat +%I 4 +308 245 +294 210 +462 210 +448 245 +4 Poly +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 0.816164 0 0 0.5 -50.9522 24 ] concat +%I +294 203 483 210 Rect +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +438 221 304 221 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +431 239 311 239 Line +%I 1 +End + +Begin %I Line +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.5 SetP +%I t +[ 1 0 0 1 -105 -80 ] concat +%I +372 244 373 221 Line +%I 1 +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I BSpl +%I b 65535 +0 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +none SetP %I p n +%I t +[ 1 0 0 1 -51.199 154.142 ] concat +%I 4 +455 287 +511 259 +462 259 +497 238 +4 BSpl +%I 1 +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.215686 0 0 0.215686 402.958 332.515 ] concat + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1.57895 0 0 1.32331 -91.2368 -87.1316 ] concat + +Begin %I MLine +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I 7 +98 308 +98 280 +147 231 +147 259 +147 231 +231 231 +231 259 +7 MLine +%I 1 +End + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 0 14 ] concat +%I 4 +98 294 +147 245 +231 245 +175 294 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.25 0 0 0.25 67.375 267.75 ] concat + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 14 -105 ] concat +%I 4 +98 294 +182 210 +259 210 +175 294 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.25 0 0 0.25 102.375 267.75 ] concat + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 14 -105 ] concat +%I 4 +98 294 +182 210 +259 210 +175 294 +4 Poly +End + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.25 0 0 0.25 137.375 267.75 ] concat + +Begin %I Poly +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 14 -105 ] concat +%I 4 +98 294 +182 210 +259 210 +175 294 +4 Poly +End + +End %I eop + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 1 0 0 1 186.801 301.142 ] concat + +Begin %I MLine +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 -238 -147 ] concat +%I 4 +315 280 +294 238 +462 238 +441 280 +4 MLine +%I 1 +End + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 -238 -140 ] concat +%I +343 245 413 259 Rect +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 -238 -147 ] concat +%I 12 +308 399 +294 399 +294 385 +294 273 +294 259 +308 259 +448 259 +462 259 +462 280 +462 385 +462 399 +448 399 +12 CBSpl +End + +Begin %I CBSpl +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +0.75 SetP +%I t +[ 1 0 0 1 -84 -126 ] concat +%I 16 +196 364 +154 364 +154 332 +154 308 +154 284 +154 252 +196 252 +224 252 +252 252 +294 252 +294 284 +294 308 +294 332 +294 364 +252 364 +224 364 +16 CBSpl +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.272727 0 0 0.272727 126.636 81.455 ] concat + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +77 266 252 420 Rect +End + +End %I eop + +End %I eop + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t +[ 1 0 0 1 -238 -147 ] concat +%I +294 231 462 238 Rect +End + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.205714 0 0 0.205714 74.66 139.44 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +77 266 252 420 Rect +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.205714 0 0 0.205714 88.66 125.44 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +77 266 252 420 Rect +End + +End %I eop + +End %I eop + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t u + +Begin %I Pict +%I b u +%I cfg u +%I cbg u +%I f u +%I p u +%I t +[ 0.205714 0 0 0.205714 74.66 97.44 ] concat + +Begin %I Rect +%I b 65535 +1 0 0 [] 0 SetB +%I cfg Black +0 0 0 SetCFg +%I cbg White +1 1 1 SetCBg +%I p +1 SetP +%I t u +%I +77 266 252 420 Rect +End + +End %I eop + +End %I eop + +End %I eop + +End %I eop + +showpage + +%%Trailer + +end diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/figure.c iv-3.1-g++2.7.2/iv/src/examples/edraw/figure.c --- iv-3.1/iv/src/examples/edraw/figure.c Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/figure.c Tue Apr 2 13:52:32 1996 @@ -0,0 +1,1946 @@ +/* + * planar figures + */ + +#include "figure.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include + +static const int buf_size = 10; + +implementPtrList(GraphicList, Graphic); + +/* +static int count = 0; + +static boolean no_events(const Event& last_e) { + Event e; + e.window(last_e.window()); + Session* session = Session::instance(); + session->poll(e); + if ( + Math::abs(e.pointer_x()-last_e.pointer_x()) > 0.5 || + Math::abs(e.pointer_x()-last_e.pointer_x()) > 0.5 + ) { + return false; + } else { + return true; + } +} +*/ + +static void corners( + Coord& left, Coord& bottom, Coord& right, Coord& top, const Transformer& t +) { + Coord x1, y1, x2, y2, x3, y3, x4, y4; + + t.transform(left, bottom, x1, y1); + t.transform(left, top, x2, y2); + t.transform(right, top, x3, y3); + t.transform(right, bottom, x4, y4); + left = Math::min(x1, x2, x3, x4); + bottom = Math::min(y1, y2, y3, y4); + right = Math::max(x1, x2, x3, x4); + top = Math::max(y1, y2, y3, y4); +} + +Graphic::Graphic (Graphic* gr) { + if (gr != nil) { + _brush = gr->brush(); + Resource::ref(_brush); + _stroke = gr->stroke(); + Resource::ref(_stroke); + _fill = gr->fill(); + Resource::ref(_fill); + _font = gr->font(); + Resource::ref(_font); + _closed = gr->closed(); + _curved = gr->curved(); + + _ctrlpts = 0; + _x = new Coord[buf_size]; + _y = new Coord[buf_size]; + _buf_size = buf_size; + if (gr->transformer() != nil) { + _t = new Transformer; + *_t = *gr->transformer(); + } else { + _t = nil; + } + } else { + _brush = nil; + _stroke = nil; + _fill = nil; + _font = nil; + _closed = false; + _curved = false; + _ctrlpts = 0; + _x = new Coord[buf_size]; + _y = new Coord[buf_size]; + _buf_size = buf_size; + _t = nil; + } + _xmin = _xmax = _ymin = _ymax = 0.0; + _parent = nil; + + _alpha_stroke = nil; + _alpha_fill = nil; + + _a_stroke = false; + _a_fill = false; + + _cache = nil; +} + +Graphic::Graphic ( + const Brush* brush, const Color* stroke, const Color* fill, + const Font* font, boolean closed, boolean curved, int coords, + Transformer* t +) { + _brush = brush; + Resource::ref(_brush); + _stroke = stroke; + Resource::ref(_stroke); + _fill = fill; + Resource::ref(_fill); + _font = font; + Resource::ref(_font); + _closed = closed; + _curved = curved; + _ctrlpts = 0; + if (coords > 0) { + _x = new Coord[coords]; + _y = new Coord[coords]; + } else { + _x = nil; + _y = nil; + } + _buf_size = coords; + _t = nil; + if (t != nil) { + _t = new Transformer; + *_t = *t; + } + _parent = nil; + + _alpha_stroke = nil; + _alpha_fill = nil; + + _a_stroke = false; + _a_fill = false; + + _xmin = _xmax = _ymin = _ymax = 0.0; + _cache = nil; +} + +Graphic::~Graphic () { + Resource::unref(_brush); + Resource::unref(_stroke); + Resource::unref(_fill); + Resource::unref(_alpha_stroke); + Resource::unref(_alpha_fill); + Resource::unref(_font); + Resource::unref(_t); + delete _x; + delete _y; + delete _cache; +} + +void Graphic::get_max_min (Coord& l, Coord& b, Coord& r, Coord& t) { + l = _xmin; + b = _ymin; + r = _xmax; + t = _ymax; +} + +int Graphic::ctrlpts (Coord*& x, Coord*& y) const{ + x = _x; + y = _y; + return _ctrlpts; +} + +void Graphic::ctrlpts (Coord* x, Coord* y, int count) { + delete _x; + delete _y; + int size = max(count, buf_size); + _x = new Coord[size]; + _y = new Coord[size]; + _ctrlpts = count; + for (int i = 0; i < count; i++) { + _x[i] = x[i]; + _y[i] = y[i]; + } + recompute_shape(); +} + +void Graphic::flush () {} + +Glyph* Graphic::clone () const { return nil; } + +Transformer* Graphic::transformer() { return _t; } + +/* To be replaced by templates */ + +void Graphic::transformer(Transformer* t) { + Resource::ref(t); + Resource::unref(_t); + _t = t; + uncacheParents(); +} + +const Brush* Graphic::brush() { return _brush; } + +void Graphic::brush(const Brush* b) { + Resource::ref(b); + Resource::unref(_brush); + _brush = b; + invalidateCaches(); +} + +boolean Graphic::alpha_stroke () { return _a_stroke; } + +void Graphic::alpha_stroke (boolean a_stroke) { + _a_stroke = a_stroke; +} + +boolean Graphic::alpha_fill () { return _a_fill; } + +void Graphic::alpha_fill (boolean a_fill) { + _a_fill = a_fill; +} + +const Color* Graphic::stroke() { return _stroke; } + +void Graphic::stroke(const Color* s) { + Resource::ref(s); + Resource::unref(_stroke); + _stroke = s; +} + +const Color* Graphic::fill() { return _fill; } + +void Graphic::fill(const Color* f) { + Resource::ref(f); + Resource::unref(_fill); + _fill = f; +} + +const Font* Graphic::font() { return _font; } + +void Graphic::font(const Font* f) { + Resource::ref(f); + Resource::unref(_font); + _font = f; + invalidateCaches(); +} + +void Graphic::closed (boolean c) { _closed = c; } + +boolean Graphic::closed () { return _closed; } + +void Graphic::curved (boolean c) { _curved = c; } + +boolean Graphic::curved () { return _curved; } + +void Graphic::parent (Graphic* p) { _parent = p; } + +Graphic* Graphic::parent () { return _parent; } + +Graphic* Graphic::root () { + Graphic* cur, *parent = this; + + do { + cur = parent; + parent = cur->parent(); + } while (parent != nil); + + return cur; +} + +void Graphic::total_gs (Graphic& gs) { + Graphic* p = parent(); + + if (p == nil) { + concat(nil, this, &gs); + + } else { + p->total_gs(gs); + concat(this, &gs, &gs); + } +} + +void Graphic::translate (float dx, float dy) { + if (dx != 0 || dy != 0) { + if (_t == nil) { + _t = new Transformer; + } + _t->translate(dx, dy); + uncacheParents(); + } +} + +void Graphic::scale (float sx, float sy, float cx, float cy) { + float ncx, ncy; + + if (sx != 1.0 || sy != 1.0) { + if (_t == nil) { + _t = new Transformer; + } + Transformer parents; + parentXform(parents); + parents.InvTransform(cx, cy, ncx, ncy); + + if (ncx != 0 || ncy != 0) { + _t->translate(-ncx, -ncy); + _t->scale(sx, sy); + _t->translate(ncx, ncy); + } else { + _t->scale(sx, sy); + } + uncacheParents(); + } +} + +void Graphic::rotate (float angle, float cx, float cy) { + float mag = (angle < 0) ? -angle : angle; + float ncx, ncy; + + if ((mag - int(mag)) != 0 || int(mag)%360 != 0) { + if (_t == nil) { + _t = new Transformer; + } + Transformer parents; + parentXform(parents); + parents.InvTransform(cx, cy, ncx, ncy); + + if (ncx != 0 || ncy != 0) { + _t->translate(-ncx, -ncy); + _t->rotate(angle); + _t->translate(ncx, ncy); + } else { + _t->rotate(angle); + } + uncacheParents(); + } +} + +void Graphic::align (Alignment falign, Graphic* moved, Alignment malign) { + float fx0, fy0, fx1, fy1, mx0, my0, mx1, my1, dx = 0, dy = 0; + + getbounds(fx0, fy0, fx1, fy1); + moved->getbounds(mx0, my0, mx1, my1); + + switch (falign) { + case BottomLeft: + case CenterLeft: + case TopLeft: + case Left: + dx = fx0; + break; + case BottomCenter: + case Center: + case TopCenter: + case HorizCenter: + dx = (fx0 + fx1 + 1)/2; + break; + case BottomRight: + case CenterRight: + case TopRight: + case Right: + dx = fx1 + 1; + break; + } + switch (falign) { + case BottomLeft: + case BottomCenter: + case BottomRight: + case Bottom: + dy = fy0; + break; + case CenterLeft: + case Center: + case CenterRight: + case VertCenter: + dy = (fy0 + fy1 + 1)/2; + break; + case TopLeft: + case TopCenter: + case TopRight: + case Top: + dy = fy1 + 1; + break; + } + + switch (malign) { + case BottomLeft: + case CenterLeft: + case TopLeft: + case Left: + dx -= mx0; + break; + case BottomCenter: + case Center: + case TopCenter: + case HorizCenter: + dx -= (mx0 + mx1 + 1)/2; + break; + case BottomRight: + case CenterRight: + case TopRight: + case Right: + dx -= (mx1 + 1); + break; + } + switch (malign) { + case BottomLeft: + case BottomCenter: + case BottomRight: + case Bottom: + dy -= my0; + break; + case CenterLeft: + case Center: + case CenterRight: + case VertCenter: + dy -= (my0 + my1 + 1)/2; + break; + case TopLeft: + case TopCenter: + case TopRight: + case Top: + dy -= (my1 + 1); + break; + } + if (dx != 0 || dy != 0) { + Transformer parents; + moved->parentXform(parents); + + parents.Invert(); + parents.Transform(0.0, 0.0, fx0, fy0); + parents.Transform(dx, dy, mx0, my0); + + moved->translate(mx0-fx0, my0-fy0); + } +} + +void Graphic::recompute_shape () { + if (_ctrlpts == 0) { + return; + } else { + _xmin = _xmax = _x[0]; + _ymin = _ymax = _y[0]; + } + for (int i = 1; i < _ctrlpts; i++) { + _xmin = Math::min(_xmin, _x[i]); + _xmax = Math::max(_xmax, _x[i]); + _ymin = Math::min(_ymin, _y[i]); + _ymax = Math::max(_ymax, _y[i]); + } +} + +void Graphic::getbounds (float& x0, float& y0, float& x1, float& y1) { + Graphic gs; + + total_gs(gs); + getbounds_gs(x0, y0, x1, y1, &gs); +} + +void Graphic::getcenter (float& x, float& y) { + Graphic gs; + float l, b, tol; + + total_gs(gs); + getextent_gs(l, b, x, y, tol, &gs); +} + +boolean Graphic::contains (PointObj& p) { + if (parent() == nil) { + return contains_gs(p, this); + + } else { + Graphic gs; + total_gs(gs); + return contains_gs(p, &gs); + } +} + +boolean Graphic::intersects (BoxObj& b) { + if (parent() == nil) { + return intersects_gs(b, this); + + } else { + Graphic gs; + total_gs(gs); + return intersects_gs(b, &gs); + } +} + +void Graphic::uncacheExtent () { + delete _cache; + _cache = nil; +} + +void Graphic::uncacheChildren () { + for (long i = 0; i < count(); i++) { + child_(i)->uncacheExtent(); + child_(i)->uncacheChildren(); + } +} + +void Graphic::uncacheParents () { + Graphic* p = parent(); + + if (p != nil) { + p->uncacheExtent(); + p->uncacheParents(); + } +} + +void Graphic::invalidateCaches() { + uncacheParents(); + uncacheExtent(); + uncacheChildren(); +} + +void Graphic::undraw () {} +void Graphic::append_(Graphic*) {} +void Graphic::prepend_(Graphic*) {} +void Graphic::insert_(GlyphIndex, Graphic*) {} +void Graphic::remove_(GlyphIndex) {} +void Graphic::remove_(Graphic*) {} +void Graphic::remove_all_() {} +void Graphic::replace_(GlyphIndex, Graphic*) {} +void Graphic::change_(GlyphIndex) {} +GlyphIndex Graphic::count_ () const { return 0; } +Graphic* Graphic::child_ (GlyphIndex) const { return nil; } +void Graphic::modified_ (GlyphIndex) {} + +long Graphic::first_containing (PointObj&, Graphic*&) { return -1; } +long Graphic::last_containing (PointObj&, Graphic*&) { return -1; } +long Graphic::first_intersecting (BoxObj&, Graphic*&) { return -1; } +long Graphic::last_intersecting (BoxObj&, Graphic*&) { return -1; } +long Graphic::first_within (BoxObj&, Graphic*&) { return -1; } +long Graphic::last_within (BoxObj&, Graphic*&) { return -1; } + +Graphic& Graphic::operator = (Graphic& g) { + brush(g.brush()); + stroke(g.stroke()); + fill(g.fill()); + font(g.font()); + alpha_stroke(g.alpha_stroke() || alpha_stroke()); + alpha_fill(g.alpha_fill() || alpha_fill()); + + if (g._t == nil) { + Resource::unref(_t); + _t = nil; + + } else { + if (_t == nil) { + _t = new Transformer(g._t); + } else { + *_t = *g._t; + } + } + invalidateCaches(); + return *this; +} + +void Graphic::add_point(Coord x, Coord y) { + if (_ctrlpts == 0) { + _xmin = x - 1; + _xmax = x + 1; + _ymin = y - 1; + _ymax = y + 1; + } else { + _xmin = Math::min(_xmin, x); + _xmax = Math::max(_xmax, x); + _ymin = Math::min(_ymin, y); + _ymax = Math::max(_ymax, y); + } + _x[_ctrlpts] = x; + _y[_ctrlpts] = y; + _ctrlpts += 1; + if (_ctrlpts >= _buf_size) { + _buf_size = buf_size + _buf_size; + Coord* x = new Coord[_buf_size]; + Coord* y = new Coord[_buf_size]; + Memory::copy(_x, x, _ctrlpts*sizeof(int)); + Memory::copy(_y, y, _ctrlpts*sizeof(int)); + delete _x; + delete _y; + _x = x; + _y = y; + } +} + +void Graphic::add_curve( + Coord x, Coord y, Coord x1, Coord y1, Coord x2, Coord y2 +) { + add_point(x1, y1); + add_point(x2, y2); + add_point(x, y); +} + +void Graphic::Bspline_move_to ( + Coord x, Coord y, Coord x1, Coord y1, Coord x2, Coord y2 +) { + Coord p1x = (x + x + x1) / 3; + Coord p1y = (y + y + y1) / 3; + Coord p2x = (x + x + x2) / 3; + Coord p2y = (y + y + y2) / 3; + add_point((p1x + p2x) / 2, (p1y + p2y) / 2); +} + +void Graphic::Bspline_curve_to ( + Coord x, Coord y, Coord x1, Coord y1, Coord x2, Coord y2 +) { + Coord p1x = (x + x + x1) / 3; + Coord p1y = (y + y + y1) / 3; + Coord p2x = (x + x + x2) / 3; + Coord p2y = (y + y + y2) / 3; + Coord p3x = (x1 + x1 + x) / 3; + Coord p3y = (y1 + y1 + y) / 3; + add_curve((p1x + p2x) / 2, (p1y + p2y) / 2, p3x, p3y, p1x, p1y); +} + +void Graphic::request(Requisition& req) const { + if (_ctrlpts > 0) { + Coord left = _xmin, bottom = _ymin; + Coord right = _xmax, top = _ymax; + Requirement& rx = req.x_requirement(); + Requirement& ry = req.y_requirement(); + + if (_t != nil) { + corners(left, bottom, right, top, *_t); + } + + rx.natural(right - left); + rx.stretch(0.0); + rx.shrink(0.0); + rx.alignment(-left / rx.natural()); + + ry.natural(top - bottom); + ry.stretch(0.0); + ry.shrink(0.0); + ry.alignment(-bottom / ry.natural()); + } +} + +void Graphic::allocate(Canvas* c, const Allocation&, Extension& ext) { + if (_ctrlpts > 0) { + Coord l, b, r, t; + getbounds(l, b, r, t); + ext.set_xy(c, l, b, r, t); + } +} + +void Graphic::draw(Canvas* c, const Allocation&) const { + if (c != nil) { + Graphic* gr = (Graphic*) this; + CanvasDamage& cd = c->rep()->damage_; + gr->drawclipped( + c, cd.left, cd.bottom, cd.right, cd.top + ); + } +} + +void Graphic::drawit (Canvas* c) { + if (parent() == nil) { + draw_gs(c, this); + + } else { + Graphic gs; + total_gs(gs); + draw_gs(c, &gs); + } +} + +boolean Graphic::drawclipped (Canvas* c, Coord l, Coord b, Coord r, Coord t) { + if (parent() == nil) { + return drawclipped_gs(c, l, b, r, t, this); + } else { + Graphic gs; + total_gs(gs); + return drawclipped_gs(c, l, b, r, t, &gs); + } +} + +void Graphic::draw_gs (Canvas* c, Graphic* gs) { + const Brush* brush = gs->brush(); + const Color* stroke = gs->stroke(); + const Color* fill = gs->fill(); + + if (stroke != nil && _alpha_stroke == nil) { + _alpha_stroke = new Color(*stroke, 0.7); + _alpha_stroke->ref(); + } + + if (fill != nil && _alpha_fill == nil) { + _alpha_fill = new Color(*fill, 0.7); + _alpha_fill->ref(); + } + + if (gs->alpha_stroke()) { + stroke = _alpha_stroke; + } + if (gs->alpha_fill()) { + fill = _alpha_fill; + } + + Transformer* tx = gs->transformer(); + if (tx != nil) { + c->push_transform(); + c->transform(*tx); + } + c->new_path(); + c->move_to(_x[0], _y[0]); + if (_curved) { + for (int i = 1; i < _ctrlpts; i += 3) { + c->curve_to( + _x[i + 2], _y[i + 2], + _x[i], _y[i], + _x[i + 1], _y[i + 1] + ); + } + } else { + for (int i = 1; i < _ctrlpts; ++i) { + c->line_to(_x[i], _y[i]); + } + } + if (_closed) { + c->close_path(); + } + if (fill != nil) { + c->fill(fill); + } + if (brush != nil && stroke != nil) { + c->stroke(stroke, brush); + } + if (tx != nil) { + c->pop_transform(); + } +} + +boolean Graphic::drawclipped_gs ( + Canvas* c, Coord l, Coord b, Coord r, Coord t, Graphic* gs +) { + Coord ll, bb, rr, tt; + getbounds_gs(ll, bb, rr, tt, gs); + + BoxObj thisBox(ll, bb, rr, tt); + BoxObj clipBox(l, b, r, t); + if (clipBox.Intersects(thisBox)) { + draw_gs(c, gs); + return true; + } else { + return false; + } +} + +void Graphic::eqv_transformer (Transformer& total) { + Graphic* p = parent(); + + if (p == nil) { + concatXform(nil, _t, &total); + + } else { + p->eqv_transformer(total); + concatXform(_t, &total, &total); + } +} + +void Graphic::getextent_gs ( + Coord& l, Coord& b, Coord& cx, Coord& cy, float& tol, Graphic* gs +) { + tol = 1.0; + const Brush* br = gs->brush(); + if (br != nil) { + float width = float(br->Width()); + tol = (width > 1) ? width : tol; + } + if (_ctrlpts > 0) { + Coord left = _xmin, bottom = _ymin; + Coord right = _xmax, top = _ymax; + Transformer* t = gs->transformer(); + + if (t != nil) { + corners(left, bottom, right, top, *t); + } + l = left; + b = bottom; + cx = (left + right)/2.0; + cy = (top + bottom)/2.0; + } +} + +void Graphic::getbounds_gs ( + Coord& l, Coord& b, Coord& r, Coord& t, Graphic* gs +) { + float tol; + + getextent_gs(l, b, r, t, tol, gs); + r += r - l; + t += t - b; + l -= tol; + b -= tol; + r += tol; + t += tol; +} + +static void invXform_gs (Coord& tx, Coord& ty, Graphic* g) { + Transformer* t = g->transformer(); + if (t != nil) { + t->inverse_transform(tx, ty); + } +} + +static void Xform_gs( + Coord x[], Coord y[], int n, Coord tx[], Coord ty[], Graphic* g +) { + Transformer* t = g->transformer(); + if (t != nil) { + register Coord* ox, * oy, *nx, *ny; + Coord* lim; + + lim = &x[n]; + for ( + ox = x, oy = y, nx = tx, ny = ty; ox < lim; ox++, oy++, nx++, ny++ + ) { + t->transform(*ox, *oy, *nx, *ny); + } + } else { + Memory::copy(x, tx, n*sizeof(Coord)); + Memory::copy(y, ty, n*sizeof(Coord)); + } +} + +boolean Graphic::contains_gs (PointObj& po, Graphic* gs) { + PointObj pt (&po); + Coord ll, bb, rr, tt; + getbounds_gs(ll, bb, rr, tt, gs); + BoxObj b(ll, bb, rr, tt); + + if (!_curved && !_fill) { + if (b.Contains(po)) { + MultiLineObj ml (_x, _y, _ctrlpts); + invXform_gs(pt._x, pt._y, gs); + if (_closed) { + LineObj l (_x[_ctrlpts - 1], _y[_ctrlpts - 1], *_x, *_y); + return ml.Contains(pt) || l.Contains(pt); + } else { + return ml.Contains(pt); + } + } + return false; + + } else if (!_curved && _fill) { + if (b.Contains(pt)) { + FillPolygonObj fp (_x, _y, _ctrlpts); + invXform_gs(pt._x, pt._y, gs); + return fp.Contains(pt); + } + return false; + + } else if (_curved && !_fill) { + if (b.Contains(pt)) { + MultiLineObj ml; + if (_closed) { + ml.ClosedSplineToPolygon(_x, _y, _ctrlpts); + } else { + ml.SplineToMultiLine(_x, _y, _ctrlpts); + } + invXform_gs(pt._x, pt._y, gs); + return ml.Contains(pt); + } + return false; + + } else { + if (b.Contains(pt)) { + FillPolygonObj fp; + fp.ClosedSplineToPolygon(_x, _y, _ctrlpts); + invXform_gs(pt._x, pt._y, gs); + return fp.Contains(pt); + } + return false; + } +} + +boolean Graphic::intersects_gs (BoxObj& userb, Graphic* gs) { + Coord* convx, *convy; + Coord ll, bb, rr, tt; + getbounds_gs(ll, bb, rr, tt, gs); + BoxObj b(ll, bb, rr, tt);; + boolean result = false; + + if (!_curved && !_fill) { + if (b.Intersects(userb)) { + convx = new Coord[_ctrlpts+1]; + convy = new Coord[_ctrlpts+1]; + Xform_gs(_x, _y, _ctrlpts, convx, convy, gs); + if (_closed) { + convx[_ctrlpts] = *convx; + convy[_ctrlpts] = *convy; + MultiLineObj ml(convx, convy, _ctrlpts+1); + result = ml.Intersects(userb); + } else { + MultiLineObj ml(convx, convy, _ctrlpts); + result = ml.Intersects(userb); + } + delete convx; + delete convy; + } + return result; + + } else if (!_curved && _fill) { + if (b.Intersects(userb)) { + convx = new Coord[_ctrlpts]; + convy = new Coord[_ctrlpts]; + Xform_gs(_x, _y, _ctrlpts, convx, convy, gs); + FillPolygonObj fp (convx, convy, _ctrlpts); + result = fp.Intersects(userb); + delete convx; + delete convy; + } + return result; + + } else if (_curved && !_fill) { + if (b.Intersects(userb)) { + convx = new Coord[_ctrlpts]; + convy = new Coord[_ctrlpts]; + Xform_gs(_x, _y, _ctrlpts, convx, convy, gs); + MultiLineObj ml; + if (_closed) { + ml.ClosedSplineToPolygon(convx, convy, _ctrlpts); + } else { + ml.SplineToMultiLine(convx, convy, _ctrlpts); + } + result = ml.Intersects(userb); + delete convx; + delete convy; + } + return result; + + } else { + if (b.Intersects(userb)) { + convx = new Coord[_ctrlpts]; + convy = new Coord[_ctrlpts]; + Xform_gs(_x, _y, _ctrlpts, convx, convy, gs); + FillPolygonObj fp; + fp.ClosedSplineToPolygon(convx, convy, _ctrlpts); + result = fp.Intersects(userb); + delete convx; + delete convy; + } + return result; + } +} + +void Graphic::parentXform (Transformer& t) { + Transformer identity; + Graphic* p = parent(); + + if (p == nil) { + *(&t) = *(&identity); + } else { + p->eqv_transformer(t); + } +} + +void Graphic::concat_gs (Graphic* a, Graphic* b, Graphic* dest) { + const Color* stroke, *fill; + const Font* font; + const Brush* br; + + if (a == nil) { + *dest = *b; + return; + } else if (b == nil) { + *dest = *a; + return; + } + + dest->alpha_stroke(a->alpha_stroke() || b->alpha_stroke()); + dest->alpha_fill(a->alpha_fill() || b->alpha_fill()); + + if ((fill = b->fill()) == nil) { + fill = a->fill(); + } + dest->fill(fill); + + if ((stroke = b->stroke()) == nil) { + stroke = a->stroke(); + } + dest->stroke(stroke); + + if ((font = b->font()) == nil) { + font = a->font(); + } + dest->font(font); + + if ((br = b->brush()) == nil) { + br = a->brush(); + } + dest->brush(br); +} + +void Graphic::concatXform ( + Transformer* a, Transformer* b, Transformer* dest +) { + Transformer identity; + if (a == nil) { + *dest = (b == nil) ? *(&identity) : *b; + + } else if (b == nil) { + *dest = *a; + + } else { + Transformer tmp(a); + tmp.Postmultiply(b); + *dest = tmp; + } +} + +void Graphic::concat (Graphic* a, Graphic* b, Graphic* dest) { + Transformer* ta = (a == nil) ? nil : a->transformer(); + Transformer* tb = (b == nil) ? nil : b->transformer(); + Transformer* td = dest->transformer(); + if (td == nil) { + td = new Transformer; + } else { + Resource::ref(td); + } + concatXform(ta, tb, td); + dest->transformer(td); + concat_gs(a, b, dest); + Resource::unref(td); +} + +boolean Graphic::contains_ (Graphic* g, PointObj& p, Graphic* gs) { + return g->contains_gs(p, gs); +} +boolean Graphic::intersects_ (Graphic* g, BoxObj& b, Graphic* gs) { + return g->intersects_gs(b, gs); +} +void Graphic::getbounds_ ( + Graphic* g, Coord& l, Coord& b, Coord& r, Coord& t, Graphic* gs +) { + g->getbounds_gs(l, b, r, t, gs); +} +void Graphic::total_gs_(Graphic* gr, Graphic& gs) { + gr->total_gs(gs); +} +void Graphic::concatgs_ (Graphic* gr, Graphic* a, Graphic* b, Graphic* dest) { + gr->concat_gs(a, b, dest); +} +void Graphic::concatXform_ ( + Graphic* gr, Transformer* a, Transformer* b, Transformer* dest +) { + gr->concatXform(a, b, dest); +} +void Graphic::concat_ (Graphic* g, Graphic* a, Graphic* b, Graphic* d) { + g->concat(a, b, d); +} +void Graphic::getextent_ ( + Graphic* gr,Coord& l, Coord& b, Coord& r, Coord& t, float& tol, Graphic* gs +) { + gr->getextent_gs(l, b, r, t, tol, gs); +} +void Graphic::draw_ (Graphic* gr, Canvas* c, Graphic* gs) { + gr->draw_gs(c, gs); +} +boolean Graphic::drawclipped_ ( + Graphic* gr, Canvas* c, Coord l, Coord b, Coord r, Coord t, Graphic* gs +) { + return gr->drawclipped_gs(c, l, b, r, t, gs); +} +void Graphic::transform_ (Coord x, Coord y, Coord& tx, Coord& ty, Graphic* g) { + Transformer* t = (g == nil) ? transformer() : g->transformer(); + + if (t != nil) { + t->Transform(x, y, tx, ty); + } else { + tx = x; + ty = y; + } +} + +/************************************************************************/ + +PolyGraphic::PolyGraphic (Graphic* gr) : Graphic (gr) { + LayoutKit* layout = LayoutKit::instance(); + _body = layout->overlay(); +} + +PolyGraphic::~PolyGraphic () { + delete _body; +} + +void PolyGraphic::request (Requisition& req) const { + _body->request(req); + Requirement& rx = req.x_requirement(); + Requirement& ry = req.y_requirement(); + + Coord left, bottom, right, top; + left = -rx.natural()*rx.alignment(); + right = left + rx.natural(); + bottom = -ry.natural()*ry.alignment(); + top = bottom + ry.natural(); + + if (_t != nil) { + corners(left, bottom, right, top, *_t); + } + rx.natural(right - left); + rx.stretch(0.0); + rx.shrink(0.0); + rx.alignment(-left / rx.natural()); + + ry.natural(top - bottom); + ry.stretch(0.0); + ry.shrink(0.0); + ry.alignment(-bottom / ry.natural()); +} + +void PolyGraphic::allocate (Canvas* c, const Allocation& a, Extension& ext) { + if (_t != nil) { + c->push_transform(); + c->transform(*_t); + } + _body->allocate(c, a, ext); + if (_t != nil) { + c->pop_transform(); + } +} + +void PolyGraphic::undraw () { _body->undraw(); } + +void PolyGraphic::append_ (Graphic* g) { + _body->append(g); + g->parent(this); + uncacheParents(); + uncacheExtent(); +} + +void PolyGraphic::prepend_ (Graphic* g) { + _body->prepend(g); + g->parent(this); + uncacheParents(); + uncacheExtent(); +} + +void PolyGraphic::insert_ (GlyphIndex i, Graphic* g) { + _body->insert(i, g); + g->parent(this); + uncacheParents(); + uncacheExtent(); +} + +void PolyGraphic::remove_ (GlyphIndex i) { + Graphic* g = (Graphic*)_body->component(i); + if (g != nil) { + g->parent(nil); + } + _body->remove(i); + uncacheParents(); + uncacheExtent(); +} + +void PolyGraphic::remove_ (Graphic* g) { + for (int i = 0; i < count_(); i++) { + if (child_(i) == g) { + remove_(i); + uncacheParents(); + uncacheExtent(); + break; + } + } +} + +void PolyGraphic::remove_all_ () { + uncacheParents(); + uncacheExtent(); + while (true) { + long i = count_()-1; + if (i >= 0) { + _body->remove(i); + } else { + break; + } + } +} + +void PolyGraphic::replace_ (GlyphIndex i, Graphic* g) { + Graphic* gr = (Graphic*) _body->component(i); + gr->parent(nil); + _body->replace(i, g); + g->parent(this); + uncacheParents(); + uncacheExtent(); +} + +void PolyGraphic::change_ (GlyphIndex i) { _body->change(i); } + +void PolyGraphic::modified_ (GlyphIndex i) { _body->modified(i); } + +void PolyGraphic::flush () { + GlyphIndex count = count_(); + + for (GlyphIndex i = 0; i < count; i++) { + Graphic* gr = child_(i); + concat_(gr, gr, this, gr); + gr->flush(); + } + Graphic n; + + *((Graphic*) this) = *(&n); + Resource::unref(_t); + _t = nil; +} + +Glyph* PolyGraphic::clone () const { + Graphic* pg = new PolyGraphic((Graphic*)this); + + GlyphIndex count = _body->count(); + for (GlyphIndex i = 0; i < count; i++) { + Glyph* gr = _body->component(i); + pg->append(gr->clone()); + } + return pg; +} + +GlyphIndex PolyGraphic::count_ () const { return _body->count(); } + +Graphic* PolyGraphic::child_ (GlyphIndex i) const { + return (Graphic*) _body->component(i); +} + +long PolyGraphic::first_containing (PointObj& pt, Graphic*& target) { + GlyphIndex count = _body->count(); + target = nil; + + for (GlyphIndex i = 0; i < count; i++) { + Graphic* gr = (Graphic*) _body->component(i); + + if (gr->contains(pt)) { + target = gr; + return i; + } + } + return -1; +} + +long PolyGraphic::last_containing (PointObj& pt, Graphic*& target) { + GlyphIndex count = _body->count(); + target = nil; + + for (GlyphIndex i = count-1; i >= 0; i--) { + Graphic* gr = (Graphic*) _body->component(i); + + if (gr->contains(pt)) { + target = gr; + return i; + } + } + return -1; +} + +long PolyGraphic::first_intersecting (BoxObj& b, Graphic*& target) { + GlyphIndex count = _body->count(); + target = nil; + + for (GlyphIndex i = 0; i < count; i++) { + Graphic* gr = (Graphic*) _body->component(i); + + if (gr->intersects(b)) { + target = gr; + return i; + } + } + return -1; +} + +long PolyGraphic::last_intersecting (BoxObj& b, Graphic*& target) { + GlyphIndex count = _body->count(); + target = nil; + + for (GlyphIndex i = count-1; i >= 0; i--) { + Graphic* gr = (Graphic*) _body->component(i); + + if (gr->intersects(b)) { + target = gr; + return i; + } + } + return -1; +} + +long PolyGraphic::first_within (BoxObj& gb, Graphic*& target) { + Coord l, b, r, t; + + GlyphIndex count = _body->count(); + target = nil; + + for (GlyphIndex i = 0; i < count; i++) { + Graphic* gr = (Graphic*) _body->component(i); + gr->getbounds(l, b, r, t); + + BoxObj box(l, b, r, t); + if (box.Within(gb)) { + target = gr; + return i; + } + } + return -1; +} + +long PolyGraphic::last_within (BoxObj& gb, Graphic*& target) { + Coord l, b, r, t; + + GlyphIndex count = _body->count(); + target = nil; + + for (GlyphIndex i = count-1; i >= 0; i--) { + Graphic* gr = (Graphic*) _body->component(i); + gr->getbounds(l, b, r, t); + + BoxObj box(l, b, r, t); + if (box.Within(gb)) { + target = gr; + return i; + } + } + return -1; +} + +void PolyGraphic::draw_gs (Canvas* c, Graphic* gs) { + Graphic gstemp; + + GlyphIndex count = _body->count(); + for (GlyphIndex i = 0; i < count; i++) { + Graphic* gr = (Graphic*) _body->component(i); + concat_(gr, gr, gs, &gstemp); + draw_(gr, c, &gstemp); + } +} + +boolean PolyGraphic::drawclipped_gs ( + Canvas* c, Coord l, Coord b, Coord r, Coord t, Graphic* gs +) { + Graphic gstemp; + boolean flag = true; + + GlyphIndex count = _body->count(); + for (GlyphIndex i = 0; i < count; i++) { + Graphic* gr = (Graphic*) _body->component(i); + concat_(gr, gr, gs, &gstemp); + flag = drawclipped_(gr, c, l, b, r, t, &gstemp) || flag; + } + return flag; +} + +void PolyGraphic::getextent_gs ( + Coord& l, Coord& b, Coord& cx, Coord& cy, float& tol, Graphic* gs +) { + Extent e; + l = b = cx = cy = tol = 0.0; + if (_cache != nil) { + e = *_cache; + } else { + if (count_() == 0) { + return; + } else { + Graphic gstemp; + Transformer ttemp; + Extent te; + gstemp.transformer(&ttemp); + + GlyphIndex count = _body->count(); + for (GlyphIndex i = 0; i < count; i++) { + Graphic* gr = (Graphic*) _body->component(i); + + concatgs_(gr, gr, gs, &gstemp); + concatXform_(gr, nil, gr->transformer(), &ttemp); + getextent_(gr, te._l, te._b, te._cx, te._cy, te._tol, &gstemp); + e.Merge(te); + } + uncacheExtent(); + _cache = new Extent(e._l, e._b, e._cx, e._cy, e._tol); + gstemp.transformer(nil); // to avoid deleting ttemp explicitly + } + } + l = e._l; b = e._b; cx = l+(e._cx-l)*2.0; cy = b+(e._cy-b)*2.0; + tol = e._tol; + + Transformer* tx = gs->transformer(); + if (tx != nil) { + corners(l, b, cx, cy, *tx); + } + cx = (cx + l)/2.0; + cy = (cy + b)/2.0; +} + +boolean PolyGraphic::contains_gs (PointObj& po, Graphic* gs) { + GlyphIndex count = _body->count(); + Graphic gstemp; + Transformer ttemp; + + gstemp.transformer(&ttemp); + for (GlyphIndex i = 0; i < count; i++) { + Graphic* gr = (Graphic*) _body->component(i); + concat_(gr, gr, gs, &gstemp); + + if (contains_(gr, po, &gstemp)) { + gstemp.transformer(nil); + return true; + } + } + gstemp.transformer(nil); /* to avoid deleting ttemp explicitly*/ + return false; +} + +boolean PolyGraphic::intersects_gs (BoxObj& box, Graphic* gs) { + GlyphIndex count = _body->count(); + Graphic gstemp; + Transformer ttemp; + + gstemp.transformer(&ttemp); + for (GlyphIndex i = 0; i < count; i++) { + Graphic* gr = (Graphic*) _body->component(i); + concat_(gr, gr, gs, &gstemp); + + if (intersects_(gr, box, &gstemp)) { + gstemp.transformer(nil); + return true; + } + } + gstemp.transformer(nil); /* to avoid deleting ttemp explicitly*/ + return false; +} + +/**********************************************************************/ +RootGraphic::RootGraphic (Graphic* gr, const Color* bg) : PolyGraphic(gr) { + _bg = bg; + Resource::ref(_bg); +} + +RootGraphic::~RootGraphic () { + Resource::unref(_bg); +} + +void RootGraphic::append_ (Graphic* g) { + _body->append(g); + uncacheParents(); + uncacheExtent(); +} + +void RootGraphic::prepend_ (Graphic* g) { + _body->prepend(g); + uncacheParents(); + uncacheExtent(); +} + +void RootGraphic::insert_ (GlyphIndex i, Graphic* g) { + _body->insert(i, g); + uncacheParents(); + uncacheExtent(); +} + +void RootGraphic::remove_ (GlyphIndex i) { + _body->remove(i); + uncacheParents(); + uncacheExtent(); +} + +void RootGraphic::remove_ (Graphic* gr) { + PolyGraphic::remove_(gr); +} + +void RootGraphic::replace_ (GlyphIndex i, Graphic* g) { + _body->replace(i, g); + uncacheParents(); + uncacheExtent(); +} + +void RootGraphic::background(const Color* bg) { + if (bg != nil) { + Resource::ref(bg); + } + if (_bg != nil) { + Resource::unref(_bg); + } + _bg = bg; +} + +Glyph* RootGraphic::clone () const { + Graphic* pg = new RootGraphic((Graphic*)this); + + GlyphIndex count = _body->count(); + for (GlyphIndex i = 0; i < count; i++) { + Glyph* gr = _body->component(i); + pg->append(gr->clone()); + } + return pg; +} + +void RootGraphic::request(Requisition& req) const { + PolyGraphic::request(req); + Requirement& rx = req.x_requirement(); + rx.alignment(0.0); + + Requirement& ry = req.y_requirement(); + ry.alignment(0.0); +} + +void RootGraphic::undraw () { + Coord l, b, r, t; + Allocation a; + _a = a; + getbounds(l, b, r, t); + translate(-l-(r-l)/2.0, -b-(t-b)/2.0); + PolyGraphic::undraw(); +} + +void RootGraphic::translate(Coord dx, Coord dy) { + if (count_() == 1) { + child_(0)->translate(dx, dy); + } else { + translate(dx, dy); + } +} + +void RootGraphic::allocate (Canvas* c, const Allocation& a, Extension& ext) { + if (!_a.equals(a, 0.001)) { + Allocation b(a); + Allotment& ax = _a.x_allotment(); + Allotment& ay = _a.y_allotment(); + Allotment& bx = b.x_allotment(); + Allotment& by = b.y_allotment(); + + translate((bx.span()-ax.span())/2.0, (by.span()-ay.span())/2.0); + translate(bx.begin()-ax.begin(), by.begin()-ay.begin()); + _a = a; + } + if (c != nil) { + PolyGraphic::allocate(c, a, ext); + } +} + +boolean RootGraphic::drawclipped_gs( + Canvas* c, Coord l, Coord b, Coord r, Coord t, Graphic* gs +) { + boolean flag = true; + c->push_clipping(); + c->clip_rect(_a.left(), _a.bottom(), _a.right(), _a.top()); + if (_bg != nil) { + c->fill_rect(l, b, r, t, _bg); + } + flag = PolyGraphic::drawclipped_gs(c, l, b, r, t, gs); + + c->pop_clipping(); + return flag; +} + +/**********************************************************************/ +Line::Line( + const Brush* brush, const Color* stroke, const Color* fill, + Coord x1, Coord y1, Coord x2, Coord y2, Transformer* t +) : Graphic(brush, stroke, fill, nil, false, false, 2, t) { + add_point(x1, y1); + add_point(x2, y2); +} + +Line::~Line () { } + +Glyph* Line::clone () const { + return new Line(_brush, _stroke, _fill, _x[0], _y[0], _x[1], _y[1], _t); +} + +/**********************************************************************/ +Rectangle::Rectangle ( + const Brush* brush, const Color* stroke, const Color* fill, + Coord l, Coord b, Coord r, Coord t, Transformer* tx +) : Graphic(brush, stroke, fill, nil, true, false, 4, tx) { + add_point(r, b); + add_point(r, t); + add_point(l, t); + add_point(l, b); +} + +Rectangle::~Rectangle () { } + +Glyph* Rectangle::clone () const { + return new Rectangle( + _brush, _stroke, _fill, _x[2], _y[0], _x[0], _y[1], _t + ); +} + +/**********************************************************************/ +static float p0 = 1.00000000; +static float p1 = 0.89657547; // cos 30 * sqrt(1 + tan 15 * tan 15) +static float p2 = 0.70710678; // cos 45 +static float p3 = 0.51763809; // cos 60 * sqrt(1 + tan 15 * tan 15) +static float p4 = 0.26794919; // tan 15 + +Circle::Circle ( + const Brush* brush, const Color* stroke, const Color* fill, + Coord x, Coord y, Coord r, Transformer* t +) : Graphic(brush, stroke, fill, nil, true, true, 25, t) { + float px0 = p0 * r, py0 = p0 * r; + float px1 = p1 * r, py1 = p1 * r; + float px2 = p2 * r, py2 = p2 * r; + float px3 = p3 * r, py3 = p3 * r; + float px4 = p4 * r, py4 = p4 * r; + + add_point(x + r, y); + add_curve(x + px2, y + py2, x + px0, y + py4, x + px1, y + py3); + add_curve(x, y + r, x + px3, y + py1, x + px4, y + py0); + add_curve(x - px2, y + py2, x - px4, y + py0, x - px3, y + py1); + add_curve(x - r, y, x - px1, y + py3, x - px0, y + py4); + add_curve(x - px2, y - py2, x - px0, y - py4, x - px1, y - py3); + add_curve(x, y - r, x - px3, y - py1, x - px4, y - py0); + add_curve(x + px2, y - py2, x + px4, y - py0, x + px3, y - py1); + add_curve(x + r, y, x + px1, y - py3, x + px0, y - py4); +} + +Circle::~Circle () { } + +Glyph* Circle::clone () const { + Coord r = _x[0] - _x[6]; + Coord x = _x[6]; + Coord y = _y[0]; + return new Circle(_brush, _stroke, _fill, x, y, r, _t); +} + +/**********************************************************************/ +Ellipse::Ellipse ( + const Brush* brush, const Color* stroke, const Color* fill, + Coord x, Coord y, Coord rx, Coord ry, Transformer* t +) : Graphic(brush, stroke, fill, nil, true, true, 25, t) { + float px0 = p0 * rx, py0 = p0 * ry; + float px1 = p1 * rx, py1 = p1 * ry; + float px2 = p2 * rx, py2 = p2 * ry; + float px3 = p3 * rx, py3 = p3 * ry; + float px4 = p4 * rx, py4 = p4 * ry; + + add_point(x + rx, y); + add_curve(x + px2, y + py2, x + px0, y + py4, x + px1, y + py3); + add_curve(x, y + ry, x + px3, y + py1, x + px4, y + py0); + add_curve(x - px2, y + py2, x - px4, y + py0, x - px3, y + py1); + add_curve(x - rx, y, x - px1, y + py3, x - px0, y + py4); + add_curve(x - px2, y - py2, x - px0, y - py4, x - px1, y - py3); + add_curve(x, y - ry, x - px3, y - py1, x - px4, y - py0); + add_curve(x + px2, y - py2, x + px4, y - py0, x + px3, y - py1); + add_curve(x + rx, y, x + px1, y - py3, x + px0, y - py4); +} + +Ellipse::~Ellipse () { } + +Glyph* Ellipse::clone () const { + Coord rx = _x[0] - _x[6]; + Coord ry = _y[6] - _y[0]; + Coord x = _x[6]; + Coord y = _y[0]; + return new Ellipse(_brush, _stroke, _fill, x, y, rx, ry, _t); +} + +/**********************************************************************/ +Open_BSpline::Open_BSpline ( + const Brush* brush, const Color* stroke, const Color* fill, + Coord* x, Coord* y, int n, Transformer* t +) : Graphic(brush, stroke, fill, nil, false, true, (n + 2) * 3 + 1, t) { + Bspline_move_to(x[0], y[0], x[0], y[0], x[0], y[0]); + Bspline_curve_to(x[0], y[0], x[0], y[0], x[1], y[1]); + for (int i = 1; i < n - 1; ++i) { + Bspline_curve_to(x[i], y[i], x[i-1], y[i-1], x[i+1], y[i+1]); + } + Bspline_curve_to(x[n-1], y[n-1], x[n-2], y[n-2], x[n-1], y[n-1]); + Bspline_curve_to(x[n-1], y[n-1], x[n-1], y[n-1], x[n-1], y[n-1]); +} + +Open_BSpline::Open_BSpline (Open_BSpline* gr) : Graphic(gr) {} + + +Open_BSpline::~Open_BSpline () { } + +Glyph* Open_BSpline::clone () const { + Graphic* gr = new Open_BSpline((Open_BSpline*) this); + gr->ctrlpts(_x, _y, _ctrlpts); + return gr; +} + +/**********************************************************************/ +Closed_BSpline::Closed_BSpline ( + const Brush* brush, const Color* stroke, const Color* fill, + Coord* x, Coord* y, int n, Transformer* t +) : Graphic(brush, stroke, fill, nil, true, true, n * 3 + 1, t) { + Bspline_move_to(x[0], y[0], x[n-1], y[n-1], x[1], y[1]); + for (int i = 1; i < n - 1; ++i) { + Bspline_curve_to(x[i], y[i], x[i-1], y[i-1], x[i+1], y[i+1]); + } + Bspline_curve_to(x[n-1], y[n-1], x[n-2], y[n-2], x[0], y[0]); + Bspline_curve_to(x[0], y[0], x[n-1], y[n-1], x[1], y[1]); +} + +Closed_BSpline::Closed_BSpline (Closed_BSpline* gr) : Graphic(gr) {} + +Closed_BSpline::~Closed_BSpline () { } + +Glyph* Closed_BSpline::clone () const { + Graphic* gr = new Closed_BSpline((Closed_BSpline*) this); + gr->ctrlpts(_x, _y, _ctrlpts); + return gr; +} +/**********************************************************************/ +Polyline::Polyline ( + const Brush* brush, const Color* stroke, const Color* fill, + Coord* x, Coord* y, int n, Transformer* t +) : Graphic(brush, stroke, fill, nil, false, false, n, t) { + add_point(x[0], y[0]); + for (int i = 1; i < n; ++i) { + add_point(x[i], y[i]); + } +} + +Polyline::~Polyline () { } + +Glyph* Polyline::clone () const { + return new Polyline(_brush, _stroke, _fill, _x, _y, _ctrlpts, _t); +} + +/**********************************************************************/ +Polygon::Polygon ( + const Brush* brush, const Color* stroke, const Color* fill, + Coord* x, Coord* y, int n, Transformer* t +) : Graphic(brush, stroke, fill, nil, true, false, n, t) { + add_point(x[0], y[0]); + for (int i = 1; i < n; ++i) { + add_point(x[i], y[i]); + } +} + +Polygon::~Polygon () { } + +Glyph* Polygon::clone () const { + return new Polygon(_brush, _stroke, _fill, _x, _y, _ctrlpts, _t); +} + +/**********************************************************************/ +Text::Text ( + const Font* f, const Color* fg, const char* text, Transformer* tx +) { + _stroke = fg; + Resource::ref(_stroke); + _font = f; + Resource::ref(_font); + _t = new Transformer; + if (tx != nil) { + *_t = *tx; + } + _fill = fg; /* a hack */ + + _text = nil; + if (text != nil) { + _text = new String(text); + } + LayoutKit* layout = LayoutKit::instance(); + _body = layout->overlay(); + init(); +} + +Text::~Text () { + delete _text; + delete _body; +} + +Glyph* Text::clone () const { + return new Text(_font, _stroke, _text->string(), _t); +} + +void Text::text (const char* text) { + delete _text; + _text = nil; + if (text != nil) { + _text = new String(text); + } + init(); +} + +const char* Text::text () { + return _text->string(); +} + +void Text::init () { + LayoutKit* layout = LayoutKit::instance(); + PolyGlyph* col = layout->vbox(); + PolyGlyph* line = layout->hbox(); + FontBoundingBox bbox; + _font->font_bbox(bbox); + Coord lineheight = bbox.ascent() + bbox.descent(); + char ch; + + for (int i = 0; (*_text)[i] != '\0'; i++) { + ch = (*_text)[i]; + + if (ch == '\n') { + line->append(layout->strut(_font)); + col->append(layout->fixed_dimension(line, Dimension_Y,lineheight)); + line = layout->hbox(); + } else if (ch == ' ') { + line->append(new Character(' ', _font, _stroke)); + } else if (ch != ')' && ch != '(') { + if (ch == '\\') { + ch = (*_text)[++i]; + if (isdigit(ch)) { + ch -= '0'; + ch *= 8; + char digit; + digit = (*_text)[i++]; + ch = (ch * 8) + digit - '0'; + digit = (*_text)[i++]; + ch = (ch * 8) + digit - '0'; + } + } + line->append(new Character(ch, _font, _stroke)); + } + } + + Transformer fixtext; + fixtext.translate(0, bbox.descent()); + _t->premultiply(fixtext); + _body->append(col); +} + +void Text::draw (Canvas* c, const Allocation& a) const { + if (_t != nil) { + c->push_transform(); + c->transform(*_t); + } + _body->draw(c, a); + if (_t != nil) { + c->pop_transform(); + } +} + +void Text::draw_gs (Canvas* c, Graphic* gs) { + Transformer* tx = gs->transformer(); + if (tx != nil) { + c->push_transform(); + c->transform(*tx); + } + if (_ctrlpts == 0) { + Requisition req; + request(req); + } + Allocation b(_a); + Allotment& bx = b.x_allotment(); + Allotment& by = b.y_allotment(); + bx.origin(0.0); + by.origin(0.0); + bx.span(_x[2]-_x[0]); + by.span(_y[2]-_y[0]); + + _body->draw(c, b); + if (tx != nil) { + c->pop_transform(); + } +} + +void Text::allocate(Canvas* c, const Allocation& a, Extension& ext) { + if (_t != nil) { + c->push_transform(); + c->transform(*_t); + } + if (_ctrlpts == 0) { + Requisition req; + request(req); + } + _a = a; + Allocation b(_a); + Allotment& bx = b.x_allotment(); + Allotment& by = b.y_allotment(); + bx.origin(0.0); + by.origin(0.0); + bx.span(_x[2]-_x[0]); + by.span(_y[2]-_y[0]); + _body->allocate(c, b, ext); + if (_t != nil) { + c->pop_transform(); + } +} + +void Text::getextent_gs ( + Coord& l, Coord& b, Coord& cx, Coord& cy, float& tol, Graphic* gr +) { + if (_ctrlpts == 0) { + Requisition req; + request(req); + } + Coord left, bottom, right, top; + + right = _x[2]; + top = _y[2]; + left = _x[0]; + bottom = _y[0]; + + Transformer* t = gr->transformer(); + if (t != nil) { + corners(left, bottom, right, top, *t); + } + tol = 3.0; + l = left; + b = bottom; + cx = (left + right)/2.0; + cy = (top + bottom)/2.0; +} + +void Text::request (Requisition& req) const { + _body->request(req); + Requirement& rx = req.x_requirement(); + Requirement& ry = req.y_requirement(); + + Coord left, bottom, right, top; + left = -rx.natural()*rx.alignment(); + right = left + rx.natural(); + bottom = -ry.natural()*ry.alignment(); + top = bottom + ry.natural(); + + Text* text = (Text*) this; + text->_ctrlpts = 4; + text->_x[0] = left; + text->_y[0] = bottom; + text->_x[1] = left; + text->_y[1] = top; + text->_x[2] = right; + text->_y[2] = top; + text->_x[3] = right; + text->_y[3] = bottom; + + if (_t != nil) { + corners(left, bottom, right, top, *_t); + } + rx.natural(right - left); + rx.stretch(0.0); + rx.shrink(0.0); + rx.alignment(-left / rx.natural()); + + ry.natural(top - bottom); + ry.stretch(0.0); + ry.shrink(0.0); + ry.alignment(-bottom / ry.natural()); +} + diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/figure.h iv-3.1-g++2.7.2/iv/src/examples/edraw/figure.h --- iv-3.1/iv/src/examples/edraw/figure.h Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/figure.h Tue Apr 2 13:52:33 1996 @@ -0,0 +1,398 @@ +/* + * planar figures + */ + +#ifndef figure_h +#define figure_h + +#include +#include +#include "globals.h" + +class Brush; +class Color; +class Font; +class Graphic; +class PolyGlyph; +class String; +class Transformer; + +declarePtrList(GraphicList, Graphic); + +class Graphic : public Glyph { +public: + Graphic(Graphic* gr = nil); + virtual ~Graphic (); + + virtual void request(Requisition&) const; + virtual void allocate(Canvas*, const Allocation&, Extension&); + virtual void draw(Canvas*, const Allocation&) const; + virtual void drawit(Canvas*); + virtual boolean drawclipped(Canvas*, Coord, Coord, Coord, Coord); + + virtual Glyph* clone() const; + virtual void flush(); + + virtual Transformer* transformer(); + virtual void transformer(Transformer*); + + void eqv_transformer(Transformer&); + void get_max_min(Coord&, Coord&, Coord&, Coord&); + + virtual void brush(const Brush*); + virtual const Brush* brush(); + + virtual void stroke(const Color*); + virtual const Color* stroke(); + virtual void fill(const Color*); + virtual const Color* fill(); + virtual void font(const Font*); + virtual const Font* font(); + virtual void closed(boolean); + virtual boolean closed(); + virtual void curved(boolean); + virtual boolean curved(); + virtual int ctrlpts(Coord*&, Coord*&) const; + virtual void ctrlpts(Coord*, Coord*, int); + virtual Graphic* parent(); + virtual void parent(Graphic*); + virtual Graphic* root(); + + virtual void translate(Coord dx, Coord dy); + virtual void scale(Coord sx, Coord sy, Coord ctrx = 0.0, Coord ctry = 0.0); + virtual void rotate(float angle, Coord ctrx = 0.0, Coord ctry = 0.0); + virtual void align(Alignment, Graphic*, Alignment); + + virtual void recompute_shape(); + virtual void getbounds(Coord&, Coord&, Coord&, Coord&); + virtual void getcenter(Coord&, Coord&); + virtual boolean contains(PointObj&); + virtual boolean intersects(BoxObj&); + + virtual void uncacheParents(); + virtual void uncacheChildren(); + virtual void uncacheExtent(); + virtual void invalidateCaches(); + + virtual void undraw(); + virtual void append_(Graphic*); + virtual void prepend_(Graphic*); + virtual void insert_(GlyphIndex, Graphic*); + virtual void remove_(GlyphIndex); + virtual void remove_(Graphic*); + virtual void remove_all_(); + virtual void replace_(GlyphIndex, Graphic*); + virtual void change_(GlyphIndex); + + virtual GlyphIndex count_() const; + virtual Graphic* child_(GlyphIndex) const; + virtual void modified_(GlyphIndex); + + virtual long first_containing(PointObj&, Graphic*&); + virtual long last_containing(PointObj&, Graphic*&); + + virtual long first_intersecting(BoxObj&, Graphic*&); + virtual long last_intersecting(BoxObj&, Graphic*&); + + virtual long first_within(BoxObj&, Graphic*&); + virtual long last_within(BoxObj&, Graphic*&); + + virtual Graphic& operator = (Graphic&); + + void add_point (Coord x, Coord y); + void add_curve (Coord x, Coord y, Coord x1, Coord y1, Coord x2, Coord y2); + void Bspline_move_to ( + Coord x, Coord y, Coord x1, Coord y1, Coord x2, Coord y2 + ); + void Bspline_curve_to ( + Coord x, Coord y, Coord x1, Coord y1, Coord x2, Coord y2 + ); + + virtual void total_gs (Graphic& gs); + virtual void draw_gs(Canvas*, Graphic*); + virtual boolean drawclipped_gs( + Canvas*, Coord, Coord, Coord, Coord, Graphic* + ); + virtual void getextent_gs( + Coord&, Coord&, Coord&, Coord& ,float& ,Graphic* gs + ); + virtual boolean contains_gs(PointObj&, Graphic* gs); + virtual boolean intersects_gs(BoxObj&, Graphic* gs); + virtual void getbounds_gs(Coord&, Coord&, Coord&, Coord&, Graphic* gs); + + void alpha_stroke(boolean); + boolean alpha_stroke(); + + void alpha_fill(boolean); + boolean alpha_fill(); +protected: + Graphic ( + const Brush* brush, const Color* stroke, const Color* fill, + const Font* font, boolean closed, boolean curved, int coords, + Transformer* + ); + + void parentXform(Transformer& t); + + virtual void concat_gs(Graphic* a, Graphic* b, Graphic* dest); + virtual void concatXform( + Transformer* a, Transformer* b, Transformer* dest + ); + virtual void concat(Graphic* a, Graphic* b, Graphic* dest); + +/* Helpers */ + + virtual boolean contains_(Graphic*, PointObj&, Graphic* gs); + virtual boolean intersects_(Graphic*, BoxObj&, Graphic* gs); + virtual void getbounds_( + Graphic*, Coord&, Coord&, Coord&, Coord&, Graphic* gs + ); + void total_gs_(Graphic*, Graphic& gs); + void concatgs_(Graphic*, Graphic*, Graphic*, Graphic*); + void concatXform_(Graphic*, Transformer*, Transformer*, Transformer*); + void concat_(Graphic*, Graphic*, Graphic*, Graphic*); + void getextent_(Graphic*, Coord&, Coord&, Coord&, Coord&, float&,Graphic*); + + void draw_(Graphic*, Canvas*, Graphic*); + boolean drawclipped_( + Graphic*, Canvas*, Coord, Coord, Coord, Coord, Graphic* + ); + void transform_(Coord, Coord, Coord&, Coord&, Graphic*); +protected: + const Brush* _brush; + + const Color* _stroke; + const Color* _fill; + + const Color* _alpha_stroke; + const Color* _alpha_fill; + + const Font* _font; + Transformer* _t; + + boolean _a_stroke; + boolean _a_fill; + + boolean _closed; + boolean _curved; + int _ctrlpts; + int _buf_size; + Coord* _x; + Coord* _y; + + Coord _xmin; + Coord _xmax; + Coord _ymin; + Coord _ymax; + + Graphic* _parent; + Extent* _cache; +}; + +class PolyGraphic : public Graphic { +public: + PolyGraphic(Graphic* = nil) ; + virtual ~PolyGraphic(); + virtual void request(Requisition&) const; + virtual void allocate(Canvas*, const Allocation&, Extension&); + + virtual void undraw(); + + virtual void append_(Graphic*); + virtual void prepend_(Graphic*); + virtual void insert_(GlyphIndex, Graphic*); + virtual void remove_(GlyphIndex); + virtual void remove_(Graphic*); + virtual void remove_all_(); + virtual void replace_(GlyphIndex, Graphic*); + virtual void change_(GlyphIndex); + + virtual GlyphIndex count_() const; + virtual Graphic* child_(GlyphIndex) const; + + virtual void modified_(GlyphIndex); + virtual void flush(); + virtual Glyph* clone() const; + + virtual long first_containing(PointObj&, Graphic*&); + virtual long last_containing(PointObj&, Graphic*&); + + virtual long first_intersecting(BoxObj&, Graphic*&); + virtual long last_intersecting(BoxObj&, Graphic*&); + + virtual long first_within(BoxObj&, Graphic*&); + virtual long last_within(BoxObj&, Graphic*&); +protected: + virtual void draw_gs(Canvas*, Graphic*); + virtual boolean drawclipped_gs( + Canvas*, Coord, Coord, Coord, Coord, Graphic* + ); + virtual boolean contains_gs(PointObj&, Graphic*); + virtual boolean intersects_gs(BoxObj&, Graphic*); + virtual void getextent_gs( + Coord&, Coord&, Coord&, Coord&, float&, Graphic* gs + ); + +protected: + PolyGlyph* _body; +}; + +class RootGraphic : public PolyGraphic { +public: + RootGraphic(Graphic* = nil, const Color* bg = nil); + virtual ~RootGraphic(); + + void background(const Color*); + const Color* background(); + + virtual void undraw(); + virtual void request(Requisition&) const; + virtual void allocate(Canvas*, const Allocation&, Extension&); + virtual void translate(Coord dx, Coord dy); + virtual Glyph* clone() const; + + virtual void append_(Graphic*); + virtual void prepend_(Graphic*); + virtual void insert_(GlyphIndex, Graphic*); + virtual void remove_(GlyphIndex); + virtual void remove_(Graphic*); + virtual void replace_(GlyphIndex, Graphic*); +protected: + virtual boolean drawclipped_gs( + Canvas*, Coord, Coord, Coord, Coord, Graphic* + ); +protected: + const Color* _bg; + Allocation _a; +}; +inline const Color* RootGraphic::background () { return _bg; } + +class Line : public Graphic { +public: + Line ( + const Brush* brush, const Color* stroke, const Color* fill, + Coord x1, Coord y1, Coord x2, Coord y2, Transformer* + ); + virtual Glyph* clone() const; + +protected: + virtual ~Line (); +}; + +class Rectangle : public Graphic { +public: + Rectangle ( + const Brush* brush, const Color* stroke, const Color* fill, + Coord l, Coord b, Coord r, Coord t, Transformer* + ); + virtual Glyph* clone() const; + +protected: + virtual ~Rectangle (); +}; + +class Circle : public Graphic { +public: + Circle ( + const Brush* brush, const Color* stroke, const Color* fill, + Coord x, Coord y, Coord r, Transformer* + ); + virtual Glyph* clone() const; + +protected: + virtual ~Circle (); +}; + +class Ellipse : public Graphic { +public: + Ellipse ( + const Brush* brush, const Color* stroke, const Color* fill, + Coord x, Coord y, Coord rx, Coord ry, Transformer* + ); + virtual Glyph* clone() const; + +protected: + virtual ~Ellipse (); +}; + +class Open_BSpline : public Graphic { +public: + Open_BSpline ( + const Brush* brush, const Color* stroke, const Color* fill, + Coord* x, Coord* y, int ctrlpts, Transformer* + ); + virtual Glyph* clone() const; + +protected: + Open_BSpline(Open_BSpline*); + virtual ~Open_BSpline (); +}; + +class Closed_BSpline : public Graphic { +public: + Closed_BSpline ( + const Brush* brush, const Color* stroke, const Color* fill, + Coord* x, Coord* y, int ctrlpts, Transformer* + ); + virtual Glyph* clone() const; + +protected: + Closed_BSpline(Closed_BSpline*); + virtual ~Closed_BSpline (); +}; + +class Polyline : public Graphic { +public: + Polyline ( + const Brush* brush, const Color* stroke, const Color* fill, + Coord* x, Coord* y, int ctrlpts, Transformer* + ); + virtual Glyph* clone() const; + +protected: + virtual ~Polyline (); +}; + +class Polygon : public Graphic { +public: + Polygon ( + const Brush* brush, const Color* stroke, const Color* fill, + Coord* x, Coord* y, int ctrlpts, Transformer* + ); + virtual Glyph* clone() const; + +protected: + virtual ~Polygon (); +}; + +class Text : public Graphic { +public: + Text ( + const Font* font, const Color* stroke, const char*, Transformer* + ); + virtual void text(const char*); + virtual const char* text(); + virtual void draw(Canvas*, const Allocation&) const; + virtual void request(Requisition&) const; + virtual void allocate(Canvas*, const Allocation&, Extension&); + virtual Glyph* clone() const; + +protected: + virtual ~Text(); + + virtual void getextent_gs (Coord&, Coord&, Coord&, Coord&,float&,Graphic*); + virtual void draw_gs(Canvas*, Graphic*); + + void init(); +protected: + String* _text; + Allocation _a; + PolyGlyph* _body; +}; + +class MpegVideo : public Graphic { +public: + MpegVideo (const char* file); +}; + +#endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/figureview.c iv-3.1-g++2.7.2/iv/src/examples/edraw/figureview.c --- iv-3.1/iv/src/examples/edraw/figureview.c Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/figureview.c Tue Apr 2 13:52:33 1996 @@ -0,0 +1,672 @@ +/* + * planar figures + */ + +#include "figureview.h" +#include "pacemaker.h" +#include "globals.h" +#include "glyphviewer.h" +#include "grabber.bm" +#include "grabberMask.bm" + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static Cursor* zoom_in_cursor = nil; +static Cursor* zoom_out_cursor = nil; +static Cursor* grabber_cursor = nil; +static Cursor* window_cursor = nil; +static double zoom_factor = 600.0; + +GrTarget::GrTarget(ViewIndex i, Graphic* t) { + _index = i; + _target = t; +} + +ViewAction::ViewAction (Graphic* gr) { + _gr = gr; +} + +Graphic* ViewAction::target () const { + return _gr; +} + +boolean ViewAction::executable () const { + return false; +} + +class Translator : public ViewAction { +public: + Translator(Graphic*, Coord, Coord); + virtual void execute(); + virtual boolean executable() const; +protected: + Coord _lx, _ly; +}; + +Translator::Translator ( + Graphic* gr, Coord lx, Coord ly +) : ViewAction(gr) { + _lx = lx; + _ly = ly; +} + +void Translator::execute () { + _gr->translate(_lx, _ly); +} + +boolean Translator::executable () const { return true; } + +class Scaler : public ViewAction { +public: + Scaler(Graphic*, Coord, Coord, Coord, Coord); + virtual void execute(); + virtual boolean executable() const; +protected: + Coord _cx, _cy, _sx, _sy; +}; + +Scaler::Scaler ( + Graphic* gr, Coord sx, Coord sy, Coord cx, Coord cy +) : ViewAction(gr) { + _sx = sx; + _sy = sy; + _cx = cx; + _cy = cy; +} + +void Scaler::execute () { + _gr->scale(_sx, _sy, _cx, _cy); +} + +boolean Scaler::executable () const { return true; } + +class Rotator : public ViewAction { +public: + Rotator(Graphic*, Coord, Coord, Coord); + virtual void execute(); + virtual boolean executable() const; +protected: + Coord _cx, _cy, _angle; +}; + +Rotator::Rotator ( + Graphic* gr, Coord angle, Coord cx, Coord cy +) : ViewAction(gr) { + _angle = angle; + _cx = cx; + _cy = cy; +} + +void Rotator::execute () { + _gr->rotate(_angle, _cx, _cy); +} + +boolean Rotator::executable () const { return true; } + +static void initcursors() { + if (zoom_in_cursor == nil) { + Bitmap* zoom_in = new Bitmap( + enlarger_hit_bits, enlarger_hit_width, enlarger_hit_height, + enlarger_hit_x_hot, enlarger_hit_y_hot + ); + Bitmap* zoom_in_mask = new Bitmap( + enlarger_mask_bits, enlarger_mask_width, enlarger_mask_height, + enlarger_mask_x_hot, enlarger_mask_y_hot + ); + + Bitmap* zoom_out = new Bitmap( + reducer_hit_bits, reducer_hit_width, reducer_hit_height, + reducer_hit_x_hot, reducer_hit_y_hot + ); + Bitmap* zoom_out_mask = new Bitmap( + reducer_mask_bits, reducer_mask_width, reducer_mask_height, + reducer_mask_x_hot, reducer_mask_y_hot + ); + + zoom_in_cursor = new Cursor(zoom_in, zoom_in_mask); + zoom_out_cursor = new Cursor(zoom_out, zoom_out_mask); + + Bitmap* grabber = new Bitmap( + grabber_bits, grabber_width, grabber_height, + grabber_x_hot, grabber_y_hot + ); + Bitmap* grabber_mask = new Bitmap( + grabberMask_bits, grabberMask_width, grabberMask_height, + grabberMask_x_hot, grabberMask_y_hot + ); + grabber_cursor = new Cursor(grabber, grabber_mask); + } +} + +static void initviews (GrView* pv) { + Graphic* p = pv->getgraphic(); + if (p != nil) { + ViewIndex p_count = p->count_(); + for (ViewIndex i = 0; i < p_count; i++) { + Graphic* c = p->child_(i); + if (c->count_() > 0) { + GrView* cv = new PolyView(c); + pv->append(cv); + //initviews(cv); + } else { + GrView* cv = new GrView(c); + pv->append(cv); + } + } + } +} + +GrView::GrView (Graphic* gr) { + _gr = gr; + Resource::ref(_gr); + _index = 0; +} + +GrView::~GrView () { + Resource::unref(_gr); +} + +Graphic* GrView::getgraphic () const { + return _gr; +} + +void GrView::setgraphic (Graphic* gr) { + Resource::ref(gr); + Resource::unref(_gr); + _gr = gr; +} + +void GrView::setindex (ViewIndex i) { + _index = i; +} + +ViewIndex GrView::getindex () const { + return _index; +} + +boolean GrView::grasp (const Event& e, Tool& tool, ViewAction*& action) { + action = nil; + ToolState& ts = tool.toolstate(); + ts._init = e; + ts._last = e; + Graphic* gr = getgraphic(); + gr->getbounds(ts._l, ts._b, ts._r, ts._t); + if (tool.tool() == Tool::scale) { + Coord lx, ly; + Coord cx, cy; + lx = e.pointer_x(); + ly = e.pointer_y(); + cx = (ts._l + ts._r)/2.0; + cy = (ts._b + ts._t)/2.0; + + action = new Scaler( + gr, Math::abs((lx-cx)*2.0/(ts._r-ts._l)), + Math::abs((ly-cy)*2.0/(ts._t-ts._b)), + cx, cy + ); + action->ref(); + } + return true; +} + +boolean GrView::manipulating ( + const Event& e, Tool& tool, ViewAction*& action +) { + action = nil; + if (e.type() == Event::up) { + return false; + } else { + unsigned int tool_type = tool.tool(); + ToolState& ts = tool.toolstate(); + + if (tool_type != Tool::nop) { + float pi = 3.14159; + + Graphic* gr = getgraphic(); + Transformer* tx = ts._gs.transformer(); + + Coord x, y, lx, ly; + + x = ts._last.pointer_x(); + y = ts._last.pointer_y(); + lx = e.pointer_x(); + ly = e.pointer_y(); + + switch(tool_type) { + case Tool::select: + break; + case Tool::move: + { + if (tx != nil) { + tx->inverse_transform(lx, ly); + tx->inverse_transform(x, y); + } + ts._last = e; + action = new Translator(gr, lx-x, ly-y); + action->ref(); + } + break; + case Tool::scale: + { + Coord cx, cy; + cx = (ts._l + ts._r)/2.0; + cy = (ts._b + ts._t)/2.0; + + ts._last = e; + action = new Scaler( + gr, (lx-cx)/(x-cx), (ly-cy)/(y-cy), cx, cy + ); + action->ref(); + } + break; + case Tool::rotate: + { + Coord cx, cy; + cx = (ts._l + ts._r)/2.0; + cy = (ts._b + ts._t)/2.0; + + float ldy = ly-cy; float ldx = lx-cx; + float dy = y-cy; float dx = x-cx; + + float cur = atan(ldy/ldx)/pi*180.0; + float last = atan(dy/dx)/pi*180.0; + + if (ldx < 0.0) { + cur += 180.0; + } + if (dx < 0.0) { + last += 180.0; + } + ts._last = e; + action = new Rotator(gr, cur-last, cx, cy); + action->ref(); + } + break; + } + } + } + return true; +} + +void GrView::effect (const Event&, Tool&, ViewAction*& action) { + action = nil; +} + +void GrView::append(GrView*) {} +void GrView::prepend(GrView*) {} +void GrView::insert(ViewIndex, GrView*) {} +void GrView::remove(ViewIndex) {} +void GrView::remove(GrView*) {} + +ViewIndex GrView::count () const { return 0; } +GrView* GrView::child (ViewIndex) const { return nil; } + +/************************************************************************/ +declarePtrList(GrViewList, GrView); +implementPtrList(GrViewList, GrView); + +PolyView::PolyView (Graphic* gr) : GrView (gr) { + _body = new GrViewList; +} + +PolyView::~PolyView () { + ViewIndex count = _body->count(); + for (ViewIndex i = 0; i < count; i++) { + GrView* grview = _body->item(i); + delete grview; + } + delete _body; + _gr->remove_all_(); +} + +void PolyView::append (GrView* g) { + _body->append(g); + g->setindex(count()-1); +} + +void PolyView::prepend (GrView* g) { + insert(0, g); +} + +void PolyView::insert (ViewIndex i, GrView* g) { + _body->insert(i, g); + for (ViewIndex j = i; j < count(); j++) { + child(j)->setindex(j); + } +} + +void PolyView::remove (ViewIndex i) { + _body->remove(i); + for (ViewIndex j = i; j < count(); j++) { + child(j)->setindex(j); + } +} + +void PolyView::remove (GrView* gr) { + ViewIndex count = _body->count(); + for (int i = 0; i < count; i++) { + if (child(i) == gr) { + remove(i); + break; + } + } +} + +ViewIndex PolyView::count () const { return _body->count(); } + +GrView* PolyView::child (ViewIndex i) const { + return _body->item(i); +} + +/**********************************************************************/ +implementList(TargetList,GrTarget); + +RootView::RootView ( + RootGraphic* rootgr, Graphic* gr, const Color* bg, GlyphViewer* gviewer +) : PolyView(gr) { + _gviewer = gviewer; + _targets = new TargetList(5); + _bg = bg; + Resource::ref(_bg); + _rootgr = rootgr; + if (_rootgr == nil) { + _rootgr = new RootGraphic(nil, _bg); + _rootgr->ref(); + } + if (gr == nil) { + setgraphic(new PolyGraphic); + } + _lx = _ly = 0.0; + initcursors(); +} + +RootView::~RootView () { + _rootgr->remove_(getgraphic()); + delete _targets; + Resource::unref(_rootgr); + Resource::unref(_bg); +} + +void RootView::setgraphic (Graphic* gr) { + if (gr == nil) { + gr = new PolyGraphic; + } + Graphic* orig = getgraphic(); + if (gr != orig) { + if (orig != nil) { + _rootgr->remove_(orig); + } + ViewIndex count = _body->count(); + for (ViewIndex i = 0; i < count; i++) { + GrView* grview = _body->item(i); + delete grview; + } + _body->remove_all(); + PolyView::setgraphic(gr); + initviews(this); + _rootgr->append_(gr); + _rootgr->undraw(); + } +} + +void RootView::background(const Color* bg) { + if (bg != nil) { + Resource::ref(bg); + } + if (_bg != nil) { + Resource::unref(_bg); + } + _bg = bg; + _rootgr->background(bg); +} + +boolean RootView::grasp (const Event& e, Tool& tool, ViewAction*& action) { + action = nil; + Window* w = e.window(); + if (window_cursor == nil) { + window_cursor = w->cursor(); + } + Graphic* target; + boolean flag = true; + float tol = 2.0; + unsigned int tool_type = tool.tool(); + Graphic* gr = getgraphic(); + WidgetKit* kit = WidgetKit::instance(); + + switch (tool_type) { + case Tool::select: + break; + case Tool::rate_scroll: + { + w->cursor(kit->ufast_cursor()); + _lx = e.pointer_x(); + _ly = e.pointer_y(); + GrTarget sel(-1, getgraphic()); + _targets->append(sel); + } + break; + case Tool::grab_scroll: + { + w->cursor(kit->hand_cursor()); + _lx = e.pointer_x(); + _ly = e.pointer_y(); + GrTarget sel(-1, getgraphic()); + _targets->append(sel); + } + break; + case Tool::rate_zoom: + { + w->cursor(zoom_in_cursor); + _lx = e.pointer_x(); + _ly = e.pointer_y(); + GrTarget sel(-1, getgraphic()); + _targets->append(sel); + } + break; + case Tool::move: + case Tool::scale: + case Tool::rotate: + { + BoxObj ibox( + e.pointer_x()-tol, e.pointer_y()-tol, + e.pointer_x()+tol, e.pointer_y()+tol + ); + long index = gr->last_intersecting(ibox, target); + if (target != nil) { + target->alpha_stroke(false); //hack + target->alpha_fill(false); //hack + + Window* w = e.window(); + Canvas* c = w->canvas(); + w->cursor(grabber_cursor); + + ToolState& ts = tool.toolstate(); + gr->total_gs(ts._gs); + + ViewAction* kidact = nil; + flag = child(index)->grasp(e, tool, kidact); + action = kidact; + GrTarget sel(index, target); + _targets->append(sel); + } + } + break; + } + return flag; +} + +boolean RootView::manipulating ( + const Event& e, Tool& tool, ViewAction*& action +) { + action = nil; + boolean flag = true; + ViewIndex count = _targets->count(); + Window* w = e.window(); + WidgetKit* kit = WidgetKit::instance(); + + Graphic* gr = getgraphic(); + unsigned int tool_type = tool.tool(); + switch (tool_type) { + case Tool::select: + case Tool::narrow: + if (e.type() == Event::up) { + flag = false; + } + break; + case Tool::rate_scroll: + { + if (e.type() == Event::up) { + flag = false; + } else { + Coord dx = _lx - e.pointer_x(); + Coord dy = _ly - e.pointer_y(); + + if (dx != 0.0 && dy != 0.0) { + double angle = atan2(dy, dx)*180/M_PI; + + if (angle < -157.5) { + w->cursor(kit->rfast_cursor()); + } else if (angle < -112.5) { + w->cursor(kit->rufast_cursor()); + } else if (angle < -67.5) { + w->cursor(kit->ufast_cursor()); + } else if (angle < -22.5) { + w->cursor(kit->lufast_cursor()); + } else if (angle < 22.5) { + w->cursor(kit->lfast_cursor()); + } else if (angle < 67.5) { + w->cursor(kit->ldfast_cursor()); + } else if (angle < 112.5) { + w->cursor(kit->dfast_cursor()); + } else if (angle < 157.5) { + w->cursor(kit->rdfast_cursor()); + } else { + w->cursor(kit->rfast_cursor()); + } + } + action = new Translator(gr, dx, dy); + action->ref(); + } + } + break; + case Tool::grab_scroll: + { + if (e.type() == Event::up) { + flag = false; + } else { + Coord dx = e.pointer_x() - _lx; + Coord dy = e.pointer_y() - _ly; + + if (dx != 0.0 || dy != 0.0) { + action = new Translator(gr, dx, dy); + action->ref(); + _lx = e.pointer_x(); + _ly = e.pointer_y(); + } + } + } + break; + case Tool::rate_zoom: + { + if (e.type() == Event::up) { + flag = false; + } else { + Coord dx = 0.0; + Coord dy = _ly - e.pointer_y(); + + if (dy != 0.0) { + double factor; + if (dy > 0.0) { + w->cursor(zoom_out_cursor); + factor = zoom_factor/(zoom_factor+dy); + + } else { + w->cursor(zoom_in_cursor); + factor = (zoom_factor-dy)/zoom_factor; + } + action = new Scaler(gr, factor, factor, _lx, _ly); + action->ref(); + } + } + } + break; + default: + { + ViewAction* kidact = nil; + for (ViewIndex i = 0; i < count && flag; i++) { + ViewIndex index = _targets->item_ref(i)._index; + + flag = child(index)->manipulating(e, tool, kidact); + } + action = kidact; + } + break; + } + return flag; +} + +void RootView::effect (const Event& e, Tool& tool, ViewAction*& action) { + action = nil; + Window* w = e.window(); + if (w != nil) { + w->cursor(window_cursor); + Canvas* c = w->canvas(); + ViewIndex count = _targets->count(); + Graphic* gr = getgraphic(); + + ViewAction* kidact = nil; + for (ViewIndex i = 0; i < count; i++) { + ViewIndex index = _targets->item_ref(i)._index; + if (index >= 0) { + child(index)->effect(e, tool, kidact); + //gr->child_(index)->flush(); + } + } + action = kidact; + _targets->remove_all(); + } +} + +Tool::Tool (unsigned int cur_tool) { + _cur_tool = cur_tool; + _toolstate = new ToolState; +} + +Tool::~Tool () { + delete _toolstate; +} + +unsigned int Tool::tool () { return _cur_tool; } + +void Tool::tool (unsigned int cur_tool) { _cur_tool = cur_tool; } + +void Tool::reset () { + delete _toolstate; + _toolstate = new ToolState; +} + + +ToolState& Tool::toolstate () { return *_toolstate; } + +void Tool::toolstate(ToolState* toolstate) { + delete _toolstate; + _toolstate = toolstate; +} + diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/figureview.h iv-3.1-g++2.7.2/iv/src/examples/edraw/figureview.h --- iv-3.1/iv/src/examples/edraw/figureview.h Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/figureview.h Tue Apr 2 13:52:33 1996 @@ -0,0 +1,151 @@ +/* + * planar figureviews + */ + +#ifndef figureview_h +#define figureview_h + +#include +#include +#include +#include "figure.h" +#include "globals.h" + +class Color; +class GlyphViewer; +class Graphic; +class GrViewList; +class Transformer; + +typedef long ViewIndex; + +class ViewAction : public Action { +public: + virtual boolean executable() const; + + Graphic* target() const; +protected: + ViewAction(Graphic* = nil); +protected: + Graphic* _gr; +}; + +class ToolState { +public: + Event _init; + Event _last; + Coord _l, _b, _r, _t; + Graphic _gs; +}; + +class Tool { +public: + enum { + nop, select, move, scale, stretch, rotate, alter, create, narrow, + rate_scroll, grab_scroll, rate_zoom + }; + + Tool(unsigned int = Tool::nop); + virtual ~Tool(); + + virtual unsigned int tool(); + virtual void tool(unsigned int); + + virtual ToolState& toolstate(); + virtual void toolstate(ToolState*); + virtual void reset(); +protected: + unsigned int _cur_tool; + ToolState* _toolstate; +}; + +class GrView : public Resource{ +public: + GrView(Graphic* gr = nil); + virtual ~GrView (); + + virtual Graphic* getgraphic() const; + virtual void setgraphic(Graphic*); + + virtual boolean grasp(const Event&, Tool&, ViewAction*&); + virtual boolean manipulating(const Event&, Tool&, ViewAction*&); + virtual void effect(const Event&, Tool&, ViewAction*&); + + virtual void append(GrView*); + virtual void prepend(GrView*); + virtual void insert(ViewIndex, GrView*); + virtual void remove(ViewIndex); + virtual void remove(GrView*); + + virtual ViewIndex count() const; + virtual GrView* child(ViewIndex) const; + virtual void setindex(ViewIndex); + virtual ViewIndex getindex() const; +protected: + Graphic* _gr; + ViewIndex _index; +}; + +class PolyView : public GrView { +public: + PolyView(Graphic* = nil) ; + virtual ~PolyView(); + + virtual void append(GrView*); + virtual void prepend(GrView*); + virtual void insert(ViewIndex, GrView*); + virtual void remove(ViewIndex); + virtual void remove(GrView*); + + virtual ViewIndex count() const; + virtual GrView* child(ViewIndex) const; + +protected: + GrViewList* _body; +}; + +class GrTarget { +public: + GrTarget(ViewIndex = 0, Graphic* = nil); +public: + ViewIndex _index; + Graphic* _target; +}; + +declareList(TargetList,GrTarget); + +class RootView : public PolyView { +public: + RootView( + RootGraphic* = nil, Graphic* = nil, + const Color* bg = nil, GlyphViewer* = nil + ); + virtual ~RootView(); + + virtual void setgraphic(Graphic*); + + RootGraphic* getrootgr(); + void background(const Color*); + const Color* background(); + void viewer(GlyphViewer*); + GlyphViewer* viewer(); + const TargetList* cur_targets() const; + + virtual boolean grasp(const Event&, Tool&, ViewAction*&); + virtual boolean manipulating(const Event&, Tool&, ViewAction*&); + virtual void effect(const Event&, Tool&, ViewAction*&); + +protected: + RootGraphic* _rootgr; + TargetList* _targets; + const Color* _bg; + GlyphViewer* _gviewer; + Coord _lx, _ly; +}; +inline const Color* RootView::background () { return _bg; } +inline GlyphViewer* RootView::viewer () { return _gviewer; } +inline void RootView::viewer (GlyphViewer* v) { _gviewer = v; } +inline const TargetList* RootView::cur_targets () const{ return _targets; } +inline RootGraphic* RootView::getrootgr () { return _rootgr; } + +#endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/gcollector.c iv-3.1-g++2.7.2/iv/src/examples/edraw/gcollector.c --- iv-3.1/iv/src/examples/edraw/gcollector.c Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/gcollector.c Tue Apr 2 13:52:33 1996 @@ -0,0 +1,431 @@ +#include "gcollector.h" +#include "pacer.h" +#include + +class TileImpl { +public: + TileImpl(); + + virtual void play(RunTime&); + virtual void get_grades(Grade& low, Grade& high); + virtual void regrade(); +public: + Pacer* _pacer; + Grade _low, _high; + SessionID _id; + + Pacer* _target; + Grade _target_x; +}; + +TileImpl::TileImpl () { + _pacer = nil; + _low = _high = -1; + _id = -1; + _target = nil; +} + +void TileImpl::play (RunTime& rtime) { + Grade low, high; + get_grades(low, high); + FadeType f = fadetype( + rtime._cur_grade, rtime._fut_grade, low, high + ); + + if (f == no_fade) { + return; + } + + if (rtime._id != _id) { + /* new session */ + + _id = rtime._id; + _target = nil; + _target_x = -1; + } + + Grade& cur = rtime._cur_grade; + Grade& fut = rtime._fut_grade; + + Grade orig_cur = cur; + Grade orig_fut = fut; + + if (_target != nil) { + cur -= _target_x; + fut -= _target_x; + _target->get_grades(low, high); + FadeType f = fadetype(cur, fut, low, high); + switch(f) { + case no_fade: + { + _target = nil; + _target_x = -1; + } + break; + case sustain: + { + _target->play(rtime); + cur = orig_cur; + fut = orig_fut; + return; + } + break; + case fadeout_low: + case fadeout_high: + { + _target->play(rtime); + } + break; + case fadein_low: + case fadein_high: + break; + } + cur = orig_cur; + fut = orig_fut; + } + + if (_pacer->count() > 0) { + Grade l, h; + _pacer->child(0)->get_grades(l, h); + cur -= l; + fut -= l; + } + + for (PacerIndex i = 0; i < _pacer->count(); i++) { + Grade l, h; + Pacer* p = _pacer->child(i); + p->get_grades(l, h); + Grade diff = h - l; + + if (cur >= 0 && cur <= diff) { + /* fade out, target already played */ + if (_target == nil) { + p->play(rtime); + } + if (cur == fut) { + //printf("target set to %d out of %d\n", i, _pacer->count()-1); + //printf("cur and fut are %d %d\n", orig_cur, orig_fut); + _target = p; + _target_x = orig_cur - cur; + //printf("target_x is %d\n", _target_x); + } + + } else if (fut >= 0 && fut <= diff) { + p->play(rtime); + _target = p; + _target_x = orig_fut - fut; + } + + cur -= (diff + 1); + fut -= (diff + 1); + + if (cur < 0 && fut < 0) { + break; + } + } + + cur = orig_cur; + fut = orig_fut; +} + +void TileImpl::get_grades (Grade& low, Grade& high) { + if (_low == -1 && _high == -1) { + for (PacerIndex i = 0; i < _pacer->count(); i++) { + Grade l, h; + _pacer->child(i)->get_grades(l, h); + _high += h - l + 1; + } + + if (_pacer->count() > 0) { + Grade l, h; + + _pacer->child(0)->get_grades(l, h); + _low = l; + _high += l; + } + } + low = _low; + high = _high; +} + +void TileImpl::regrade () { + _low = -1; + _high = -1; + + for (PacerIndex i = 0; i < _pacer->count(); i++) { + Grade l, h; + _pacer->child(i)->regrade(); + _pacer->child(i)->get_grades(l, h); + _high += h - l + 1; + } + + if (_pacer->count() > 0) { + Grade l, h; + + _pacer->child(0)->get_grades(l, h); + _low = l; + _high += l; + } + +} + +/***************************************************************************/ +class NormalImpl { +public: + NormalImpl(); + + virtual void play(RunTime&); + virtual void get_grades(Grade& low, Grade& high); + virtual void regrade(); +public: + Pacer* _pacer; + Grade _low, _high; + SessionID _id; +}; + +NormalImpl::NormalImpl () { + _pacer = nil; + _low = _high = -1; + _id = -1; +} + +void NormalImpl::play (RunTime& rtime) { + Grade low, high; + get_grades(low, high); + FadeType f = fadetype( + rtime._cur_grade, rtime._fut_grade, low, high + ); + + if (f == no_fade) { + return; + } + Grade& cur = rtime._cur_grade; + Grade& fut = rtime._fut_grade; + + Grade orig_cur = cur; + Grade orig_fut = fut; + + Grade diff = _high - _low; + float cur_f, fut_f; + + if (diff == 0) { + if (cur == 0 || fut == 0) { + cur_f = cur; + fut_f = fut; + } else { + return; + } + } else { + cur_f = ((float)cur)/((float)diff); + fut_f = ((float)fut)/((float)diff); + } + + for (PacerIndex i = 0; i < _pacer->count(); i++) { + Grade l, h; + Pacer* p = _pacer->child(i); + p->get_grades(l, h); + + cur = (Grade)(cur_f * (h - l) + l); + fut = (Grade)(fut_f * (h - l) + l); + p->play(rtime); + } + + cur = orig_cur; + fut = orig_fut; +} + +void NormalImpl::get_grades (Grade& low, Grade& high) { + if (_low == -1 || _high == -1) { + for (PacerIndex i = 0; i < _pacer->count(); i++) { + Grade l, h; + _pacer->child(i)->get_grades(l, h); + if (_high < (h - l)) { + _high = h - l; + } + } + } + low = _low; + high = _high; +} + +void NormalImpl::regrade () { + _low = 0; + _high = -1; + for (PacerIndex i = 0; i < _pacer->count(); i++) { + Grade l, h; + _pacer->child(i)->regrade(); + _pacer->child(i)->get_grades(l, h); + if (_high < (h - l)) { + _high = h - l; + } + } +} + +/***************************************************************************/ +class DistribImpl { +public: + DistribImpl(); + + virtual void play(RunTime&); + virtual void get_grades(Grade& low, Grade& high); + virtual void regrade(); +public: + Pacer* _pacer; + Grade _low, _high; + SessionID _id; +}; + +DistribImpl::DistribImpl () { + _pacer = nil; + _low = _high = -1; + _id = -1; +} + +void DistribImpl::regrade () { + _low = -1; + _high = -1; + if (_pacer->count() > 0) { + _pacer->child(0)->regrade(); + _pacer->child(0)->get_grades(_low, _high); + } + + for (PacerIndex i = 1; i < _pacer->count(); i++) { + Grade l, h; + _pacer->child(i)->regrade(); + _pacer->child(i)->get_grades(l, h); + if (h > _high) { + _high = h; + } + if (l < _low) { + _low = l; + } + } +} + +void DistribImpl::get_grades (Grade& low, Grade& high) { + if (_low == -1 || _high == -1) { + if (_pacer->count() > 0) { + _pacer->child(0)->get_grades(_low, _high); + } + + for (PacerIndex i = 1; i < _pacer->count(); i++) { + Grade l, h; + _pacer->child(i)->get_grades(l, h); + if (h > _high) { + _high = h; + } + if (l < _low) { + _low = l; + } + } + } + low = _low; + high = _high; +} + +void DistribImpl::play (RunTime& rtime) { + Grade low, high; + get_grades(low, high); + FadeType f = fadetype( + rtime._cur_grade, rtime._fut_grade, low, high + ); + + if (f == no_fade) { + return; + } + Grade& cur = rtime._cur_grade; + Grade& fut = rtime._fut_grade; + + for (PacerIndex i = 0; i < _pacer->count(); i++) { + Grade l, h; + Pacer* p = _pacer->child(i); + p->get_grades(l, h); + + if (cur >= l && cur <= h) { + p->play(rtime); + + } else if (fut >= l && fut <= h) { + p->play(rtime); + } + } +} + +/***************************************************************************/ +GradeCollector::GradeCollector () {} + +GradeCollector::~GradeCollector () {} + +void GradeCollector::set_pacer (Pacer*) {} + +/***************************************************************************/ +Tiler::Tiler () { + _impl = new TileImpl; +} + +Tiler::~Tiler () { delete _impl; } + +void Tiler::play (RunTime& rtime) { + _impl->play(rtime); +} + +void Tiler::set_pacer (Pacer* p) { + _impl->_pacer = p; +} + +void Tiler::get_grades (Grade& low, Grade& high) { + Grade l, h; + _impl->get_grades(l, h); + low = l; high = h; +} + +void Tiler::regrade () { + _impl->regrade(); +} + +Normalizer::Normalizer () { + _impl = new NormalImpl; +} + +Normalizer::~Normalizer () { delete _impl; } + +void Normalizer::play (RunTime& rtime) { + _impl->play(rtime); +} + +void Normalizer::set_pacer (Pacer* p) { + _impl->_pacer = p; +} + +void Normalizer::get_grades (Grade& low, Grade& high) { + Grade l, h; + _impl->get_grades(l, h); + low = l; high = h; +} + +void Normalizer::regrade () { + _impl->regrade(); +} + +Distributor::Distributor () { + _impl = new DistribImpl; +} + +Distributor::~Distributor () { delete _impl; } + +void Distributor::play (RunTime& rtime) { + _impl->play(rtime); +} + +void Distributor::set_pacer (Pacer* p) { + _impl->_pacer = p; +} + +void Distributor::get_grades (Grade& low, Grade& high) { + Grade l, h; + _impl->get_grades(l, h); + low = l; high = h; +} + +void Distributor::regrade () { + _impl->regrade(); +} diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/gcollector.h iv-3.1-g++2.7.2/iv/src/examples/edraw/gcollector.h --- iv-3.1/iv/src/examples/edraw/gcollector.h Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/gcollector.h Tue Apr 2 13:52:33 1996 @@ -0,0 +1,70 @@ +#ifndef gcollector_h +#define gcollector_h + +#include +#include "globals.h" + +class Pacer; +class TileImpl; +class NormalImpl; +class DistribImpl; + +class GradeCollector { +public: + virtual ~GradeCollector(); + + virtual void play(RunTime&) = 0; + virtual void get_grades(Grade& low, Grade& high) = 0; + virtual void regrade() = 0; + + virtual void set_pacer(Pacer*); +protected: + GradeCollector(); +}; + +class Tiler : public GradeCollector { +public: + Tiler(); + virtual ~Tiler(); + + virtual void play(RunTime&); + virtual void get_grades(Grade& low, Grade& high); + virtual void regrade(); + + virtual void set_pacer(Pacer*); +private: + TileImpl* _impl; +}; + +class Normalizer : public GradeCollector { +public: + Normalizer(); + virtual ~Normalizer(); + + virtual void play(RunTime&); + virtual void get_grades(Grade& low, Grade& high); + virtual void regrade(); + + virtual void set_pacer(Pacer*); +private: + NormalImpl* _impl; +}; + +class Distributor : public GradeCollector { +public: + Distributor(); + virtual ~Distributor(); + + virtual void play(RunTime&); + virtual void get_grades(Grade& low, Grade& high); + virtual void regrade(); + + virtual void set_pacer(Pacer*); +private: + DistribImpl* _impl; +}; + +#endif + + + diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/globals.c iv-3.1-g++2.7.2/iv/src/examples/edraw/globals.c --- iv-3.1/iv/src/examples/edraw/globals.c Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/globals.c Tue Apr 2 13:52:33 1996 @@ -0,0 +1,674 @@ +#include "globals.h" +#include + +implementPtrList(PacerList, Pacer); +implementPtrList(SchedulerList, Scheduler); + +FadeType fadetype (Grade cur, Grade fut, Grade low, Grade high) { + if (cur != fut) { + if (cur >= low && fut < low) { + return fadeout_low; + } else if (cur < low && fut >= low) { + return fadein_low; + } else if (cur > high && fut <= high) { + return fadein_high; + } else if (cur <= high && fut > high) { + return fadeout_high; + } else if (cur >= low && cur <= high && fut >= low && fut <= high) { + return sustain; + } else { + return no_fade; + } + } else if (cur >= low && cur <= high) { + return sustain; + } else { + return no_fade; + } +} + +/*****************************************************************************/ + +static const int NUMPOINTS = 200; // must be > 1 +static const double SMOOTHNESS = 1.0; +static int mlsize = 0; +static int mlcount = 0; +static Coord* mlx, *mly; + +/**********************************************************/ +RunTime::RunTime () { + _cur_grade = -1; + _fut_grade = -1; + _sec = -1; + _usec = -1; + _period = -1; + _id = -10000; +} + +/**********************************************************/ + +TimeSlice::TimeSlice (USec nat, USec str, USec shr) { + _nat = nat; + _str = str; + _shr = shr; +} + +TimeSlice::TimeSlice (const TimeSlice& s) { + _nat = s._nat; + _str = s._str; + _shr = s._shr; +} + +TimeSlice& TimeSlice::operator = (const TimeSlice& s) { + _nat = s._nat; + _str = s._str; + _shr = s._shr; + return *this; +} + +boolean TimeSlice::operator == (const TimeSlice& s) { + return (_nat == s._nat && _str == s._str && _shr == s._shr); +} + +boolean TimeSlice::operator != (const TimeSlice& s) { + return (_nat != s._nat || _str != s._str || _shr != s._shr); +} + +USec TimeSlice::min () { return (_nat-_shr); } +USec TimeSlice::max () { return (_nat+_str); } + +/*****************************************************************************/ + +PointObj::PointObj (Coord x, Coord y) { _x = x; _y = y; } +PointObj::PointObj (PointObj* p) { _x = p->_x; _y = p->_y; } + +float PointObj::Distance (PointObj& p) { + return sqrt(float(square(_x - p._x) + square(_y - p._y))); +} + +/*****************************************************************************/ + +LineObj::LineObj (Coord x0, Coord y0, Coord x1, Coord y1) { + _p1._x = x0; _p1._y = y0; _p2._x = x1; _p2._y = y1; +} + +LineObj::LineObj (LineObj* l) { + _p1._x = l->_p1._x; _p1._y = l->_p1._y; + _p2._x = l->_p2._x; _p2._y = l->_p2._y; +} +boolean LineObj::Contains (PointObj& p) { + return + (p._x >= min(_p1._x, _p2._x)) && (p._x <= max(_p1._x, _p2._x)) && + (p._y >= min(_p1._y, _p2._y)) && (p._y <= max(_p1._y, _p2._y)) && ( + (p._y - _p1._y)*(_p2._x - _p1._x) - + (_p2._y - _p1._y)*(p._x - _p1._x) + ) == 0; +} + +inline int signum (int a) { + if (a < 0) { + return -1; + } else if (a > 0) { + return 1; + } else { + return 0; + } +} + +int LineObj::Same (PointObj& p1, PointObj& p2) { + Coord dx, dx1, dx2; + Coord dy, dy1, dy2; + + dx = _p2._x - _p1._x; + dy = _p2._y - _p1._y; + dx1 = p1._x - _p1._x; + dy1 = p1._y - _p1._y; + dx2 = p2._x - _p2._x; + dy2 = p2._y - _p2._y; + + return signum((int)(dx*dy1 - dy*dx1)) * signum((int)(dx*dy2 - dy*dx2)); +} + +boolean LineObj::Intersects (LineObj& l) { // from Sedgewick, p. 313 + BoxObj b1 (_p1._x, _p1._y, _p2._x, _p2._y); + BoxObj b2 (l._p1._x, l._p1._y, l._p2._x, l._p2._y); + + return + b1.Intersects(b2) && Same(l._p1, l._p2) <= 0 && l.Same(_p1, _p2) <= 0; +} + +/*****************************************************************************/ + +BoxObj::BoxObj (Coord x0, Coord y0, Coord x1, Coord y1) { + _l = min(x0, x1); _b = min(y0, y1); + _r = max(x0, x1); _t = max(y0, y1); +} + +BoxObj::BoxObj (BoxObj* b) { + _l = b->_l; _b = b->_b; _r = b->_r; _t = b->_t; +} + +boolean BoxObj::operator== (BoxObj& box) { + float tol = 0.0001; + return ( + Math::equal(_l, box._l, tol) && + Math::equal(_r, box._r, tol) && + Math::equal(_b, box._b, tol) && + Math::equal(_t, box._t, tol) + ); +} + +boolean BoxObj::Contains (PointObj& p) { + return + (p._x >= _l) && (p._x <= _r) && + (p._y >= _b) && (p._y <= _t); +} + +boolean BoxObj::Intersects (BoxObj& b) { + return ( + (_l <= b._r) && (b._l <= _r) && + (_b <= b._t) && (b._b <= _t) + ); +} + +boolean BoxObj::Intersects (LineObj& l) { + Coord x1 = min(l._p1._x, l._p2._x); + Coord x2 = max(l._p1._x, l._p2._x); + Coord y1 = min(l._p1._y, l._p2._y); + Coord y2 = max(l._p1._y, l._p2._y); + BoxObj lbox(x1, y1, x2, y2); + boolean intersects = false; + + if (Intersects(lbox)) { + intersects = Contains(l._p1) || Contains(l._p2); + if (!intersects) { + LineObj l0 (_l, _b, _r, _b); + LineObj l1 (_r, _b, _r, _t); + LineObj l2 (_r, _t, _l, _t); + LineObj l3 (_l, _t, _l, _b); + intersects = + l.Intersects(l0) || l.Intersects(l1) || + l.Intersects(l2) || l.Intersects(l3); + } + } + return intersects; +} + +BoxObj BoxObj::operator- (BoxObj& b) { + BoxObj i; + + if (Intersects(b)) { + i._l = max(_l, b._l); + i._b = max(_b, b._b); + i._r = min(_r, b._r); + i._t = min(_t, b._t); + } + return i; +} + +BoxObj BoxObj::operator+ (BoxObj& b) { + BoxObj m; + + m._l = min(_l, b._l); + m._b = min(_b, b._b); + m._r = max(_r, b._r); + m._t = max(_t, b._t); + return m; +} + +boolean BoxObj::Within (BoxObj& b) { + return ( + (_l >= b._l) && (_b >= b._b) && + (_r <= b._r) && (_t <= b._t) + ); +} + +/*****************************************************************************/ + +MultiLineObj::MultiLineObj (Coord* x, Coord* y, int count) { + _x = x; _y = y; _count = count; +} + +void MultiLineObj::GrowBuf () { + Coord* newx, *newy; + int newsize; + + if (mlsize == 0) { + mlsize = NUMPOINTS; + mlx = new Coord[NUMPOINTS]; + mly = new Coord[NUMPOINTS]; + } else { + newsize = mlsize * 2; + newx = new Coord[newsize]; + newy = new Coord[newsize]; + Memory::copy(mlx, newx, newsize * sizeof(Coord)); + Memory::copy(mly, newy, newsize * sizeof(Coord)); + delete mlx; + delete mly; + mlx = newx; + mly = newy; + mlsize = newsize; + } +} + +boolean MultiLineObj::CanApproxWithLine ( + double x0, double y0, double x2, double y2, double x3, double y3 +) { + double triangleArea, sideSquared, dx, dy; + + triangleArea = x0*y2 - x2*y0 + x2*y3 - x3*y2 + x3*y0 - x0*y3; + triangleArea *= triangleArea; // actually 4 times the area + dx = x3 - x0; + dy = y3 - y0; + sideSquared = dx*dx + dy*dy; + return triangleArea <= SMOOTHNESS * sideSquared; +} + +void MultiLineObj::AddLine (double x0, double y0, double x1, double y1) { + if (mlcount >= mlsize) { + GrowBuf(); + } + if (mlcount == 0) { + mlx[mlcount] = round(x0); + mly[mlcount] = round(y0); + ++mlcount; + } + mlx[mlcount] = round(x1); + mly[mlcount] = round(y1); + ++mlcount; +} + +void MultiLineObj::AddBezierArc ( + double x0, double y0, double x1, double y1, + double x2, double y2, double x3, double y3 +) { + double midx01, midx12, midx23, midlsegx, midrsegx, cx, + midy01, midy12, midy23, midlsegy, midrsegy, cy; + + Midpoint(x0, y0, x1, y1, midx01, midy01); + Midpoint(x1, y1, x2, y2, midx12, midy12); + Midpoint(x2, y2, x3, y3, midx23, midy23); + Midpoint(midx01, midy01, midx12, midy12, midlsegx, midlsegy); + Midpoint(midx12, midy12, midx23, midy23, midrsegx, midrsegy); + Midpoint(midlsegx, midlsegy, midrsegx, midrsegy, cx, cy); + + if (CanApproxWithLine(x0, y0, midlsegx, midlsegy, cx, cy)) { + AddLine(x0, y0, cx, cy); + } else if ( + (midx01 != x1) || (midy01 != y1) || (midlsegx != x2) || + (midlsegy != y2) || (cx != x3) || (cy != y3) + ) { + AddBezierArc(x0, y0, midx01, midy01, midlsegx, midlsegy, cx, cy); + } + + if (CanApproxWithLine(cx, cy, midx23, midy23, x3, y3)) { + AddLine(cx, cy, x3, y3); + } else if ( + (cx != x0) || (cy != y0) || (midrsegx != x1) || (midrsegy != y1) || + (midx23 != x2) || (midy23 != y2) + ) { + AddBezierArc(cx, cy, midrsegx, midrsegy, midx23, midy23, x3, y3); + } +} + +void MultiLineObj::CalcSection ( + Coord cminus1x, Coord cminus1y, Coord cx, Coord cy, + Coord cplus1x, Coord cplus1y, Coord cplus2x, Coord cplus2y +) { + double p0x, p1x, p2x, p3x, tempx, + p0y, p1y, p2y, p3y, tempy; + + ThirdPoint( + double(cx), double(cy), double(cplus1x), double(cplus1y), p1x, p1y + ); + ThirdPoint( + double(cplus1x), double(cplus1y), double(cx), double(cy), p2x, p2y + ); + ThirdPoint( + double(cx), double(cy), double(cminus1x), double(cminus1y), + tempx, tempy + ); + Midpoint(tempx, tempy, p1x, p1y, p0x, p0y); + ThirdPoint( + double(cplus1x), double(cplus1y), double(cplus2x), double(cplus2y), + tempx, tempy + ); + Midpoint(tempx, tempy, p2x, p2y, p3x, p3y); + AddBezierArc(p0x, p0y, p1x, p1y, p2x, p2y, p3x, p3y); +} + +void MultiLineObj::SplineToMultiLine (Coord* cpx, Coord* cpy, int cpcount) { + register int cpi; + + if (cpcount < 3) { + _x = cpx; + _y = cpy; + _count = cpcount; + } else { + mlcount = 0; + + CalcSection( + cpx[0], cpy[0], cpx[0], cpy[0], cpx[0], cpy[0], cpx[1], cpy[1] + ); + CalcSection( + cpx[0], cpy[0], cpx[0], cpy[0], cpx[1], cpy[1], cpx[2], cpy[2] + ); + + for (cpi = 1; cpi < cpcount - 2; ++cpi) { + CalcSection( + cpx[cpi - 1], cpy[cpi - 1], cpx[cpi], cpy[cpi], + cpx[cpi + 1], cpy[cpi + 1], cpx[cpi + 2], cpy[cpi + 2] + ); + } + + CalcSection( + cpx[cpi - 1], cpy[cpi - 1], cpx[cpi], cpy[cpi], + cpx[cpi + 1], cpy[cpi + 1], cpx[cpi + 1], cpy[cpi + 1] + ); + CalcSection( + cpx[cpi], cpy[cpi], cpx[cpi + 1], cpy[cpi + 1], + cpx[cpi + 1], cpy[cpi + 1], cpx[cpi + 1], cpy[cpi + 1] + ); + _x = mlx; + _y = mly; + _count = mlcount; + } +} + +void MultiLineObj::ClosedSplineToPolygon (Coord* cpx, Coord* cpy, int cpcount){ + register int cpi; + + if (cpcount < 3) { + _x = cpx; + _y = cpy; + _count = cpcount; + } else { + mlcount = 0; + CalcSection( + cpx[cpcount - 1], cpy[cpcount - 1], cpx[0], cpy[0], + cpx[1], cpy[1], cpx[2], cpy[2] + ); + + for (cpi = 1; cpi < cpcount - 2; ++cpi) { + CalcSection( + cpx[cpi - 1], cpy[cpi - 1], cpx[cpi], cpy[cpi], + cpx[cpi + 1], cpy[cpi + 1], cpx[cpi + 2], cpy[cpi + 2] + ); + } + + CalcSection( + cpx[cpi - 1], cpy[cpi - 1], cpx[cpi], cpy[cpi], + cpx[cpi + 1], cpy[cpi + 1], cpx[0], cpy[0] + ); + CalcSection( + cpx[cpi], cpy[cpi], cpx[cpi + 1], cpy[cpi + 1], + cpx[0], cpy[0], cpx[1], cpy[1] + ); + _x = mlx; + _y = mly; + _count = mlcount; + } +} + +void MultiLineObj::GetBox (BoxObj& b) { + b._l = b._r = _x[0]; + b._b = b._t = _y[0]; + + for (int i = 1; i < _count; ++i) { + b._l = min(b._l, _x[i]); + b._b = min(b._b, _y[i]); + b._r = max(b._r, _x[i]); + b._t = max(b._t, _y[i]); + } +} + + +boolean MultiLineObj::Contains (PointObj& p) { + register int i; + BoxObj b; + + GetBox(b); + if (b.Contains(p)) { + for (i = 1; i < _count; ++i) { + LineObj l (_x[i-1], _y[i-1], _x[i], _y[i]); + if (l.Contains(p)) { + return true; + } + } + } + return false; +} + +boolean MultiLineObj::Intersects (LineObj& l) { + register int i; + BoxObj b; + + GetBox(b); + if (b.Intersects(l)) { + for (i = 1; i < _count; ++i) { + LineObj test(_x[i-1], _y[i-1], _x[i], _y[i]); + + if (l.Intersects(test)) { + return true; + } + } + } + return false; +} + +boolean MultiLineObj::Intersects (BoxObj& userb) { + register int i; + BoxObj b; + + GetBox(b); + if (b.Intersects(userb)) { + for (i = 1; i < _count; ++i) { + LineObj test(_x[i-1], _y[i-1], _x[i], _y[i]); + + if (userb.Intersects(test)) { + return true; + } + } + } + return false; +} + +boolean MultiLineObj::Within (BoxObj& userb) { + BoxObj b; + + GetBox(b); + return b.Within(userb); +} + +/*****************************************************************************/ + +FillPolygonObj::FillPolygonObj ( + Coord* x, Coord* y, int n +) : MultiLineObj(x, y, n) { + _normCount = 0; + _normx = _normy = nil; +} + +FillPolygonObj::~FillPolygonObj () { + delete _normx; + delete _normy; +} + +static int LowestLeft (Coord* x, Coord* y, int count) { + register int i; + int lowestLeft = 0; + Coord lx = *x; + Coord ly = *y; + + for (i = 1; i < count; ++i) { + if (y[i] < ly || (y[i] == ly && x[i] < lx)) { + lowestLeft = i; + lx = x[i]; + ly = y[i]; + } + } + return lowestLeft; +} + +void FillPolygonObj::Normalize () { + if (_count != 0) { + register int i, newcount = 1; + int lowestLeft, limit = _count; + + if (*_x == _x[_count - 1] && *_y == _y[_count - 1]) { + --limit; + } + lowestLeft = LowestLeft(_x, _y, limit); + _normCount = limit + 2; + _normx = new Coord[_normCount]; + _normy = new Coord[_normCount]; + + for (i = lowestLeft; i < limit; ++i, ++newcount) { + _normx[newcount] = _x[i]; + _normy[newcount] = _y[i]; + } + for (i = 0; i < lowestLeft; ++i, ++newcount) { + _normx[newcount] = _x[i]; + _normy[newcount] = _y[i]; + } + + _normx[newcount] = _normx[1]; + _normy[newcount] = _normy[1]; + --newcount; + _normx[0] = _normx[newcount]; + _normy[0] = _normy[newcount]; + } +} + +boolean FillPolygonObj::Contains (PointObj& p) { // derived from A. Glassner, + if (_normCount == 0) { // "An Introduction to + Normalize(); // Ray Tracing", p. 53, + } // courtesy R. Cooperman + + int count = 0; + PointObj p0(0, 0); + boolean cur_y_sign = _normy[0] >= p._y; + + for (int i = 0; i < _normCount - 2; ++i) { + LineObj l ( + _normx[i] - p._x, _normy[i] - p._y, + _normx[i+1] - p._x, _normy[i+1] - p._y + ); + + if (l.Contains(p0)) { + return true; + } + + boolean next_y_sign = l._p2._y >= 0; + + if (next_y_sign != cur_y_sign) { + boolean cur_x_sign = l._p1._x >= 0; + boolean next_x_sign = l._p2._x >= 0; + + if (cur_x_sign && next_x_sign) { + ++count; + + } else if (cur_x_sign || next_x_sign) { + Coord dx = l._p2._x - l._p1._x; + Coord dy = l._p2._y - l._p1._y; + + if (dy >= 0) { + if (l._p1._x * dy > l._p1._y * dx) { + ++count; + } + } else { + if (l._p1._x * dy < l._p1._y * dx) { + ++count; + } + } + } + } + cur_y_sign = next_y_sign; + } + return count % 2 == 1; +} + +boolean FillPolygonObj::Intersects (LineObj& l) { + BoxObj b; + boolean intersects = false; + + if (_normCount == 0) { + Normalize(); + } + + GetBox(b); + + if (b.Intersects(l)) { + MultiLineObj ml (_normx, _normy, _normCount - 1); + intersects = ml.Intersects(l) || Contains(l._p1) || Contains(l._p2); + } + + return intersects; +} + +boolean FillPolygonObj::Intersects (BoxObj& ub) { + BoxObj b; + + GetBox(b); + if (!b.Intersects(ub)) { + return false; + } + if (b.Within(ub)) { + return true; + } + LineObj bottom(ub._l, ub._b, ub._r, ub._b); + + if (Intersects(bottom)) { + return true; + } + + LineObj right(ub._r, ub._b, ub._r, ub._t); + + if (Intersects(right)) { + return true; + } + + LineObj top(ub._r, ub._t, ub._l, ub._t); + + if (Intersects(top)) { + return true; + } + + LineObj left(ub._l, ub._t, ub._l, ub._b); + + return Intersects(left); +} + +/*****************************************************************************/ + +Extent::Extent (float x0, float y0, float x1, float y1, float t) { + _l = x0; _b = y0; _cx = x1; _cy = y1; _tol = t; +} + +Extent::Extent (Extent& e) { + _l = e._l; _b = e._b; + _cx = e._cx; _cy = e._cy; _tol = e._tol; +} + +boolean Extent::Within (Extent& e) { + float l = _l - _tol, b = _b - _tol; + float el = e._l - _tol, eb = e._b - _tol; + + return + l >= el && b >= eb && 2*_cx - l <= 2*e._cx - el && + 2*_cy - b <= 2*e._cy - eb; + } + +void Extent::Merge (Extent& e) { + float nl = min(_l, e._l); + float nb = min(_b, e._b); + + if (Undefined()) { + _l = e._l; _b = e._b; _cx = e._cx; _cy = e._cy; + } else if (!e.Undefined()) { + _cx = (nl + max(2*_cx - _l, 2*e._cx - e._l)) / 2; + _cy = (nb + max(2*_cy - _b, 2*e._cy - e._b)) / 2; + _l = nl; + _b = nb; + } + _tol = max(_tol, e._tol); +} diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/globals.h iv-3.1-g++2.7.2/iv/src/examples/edraw/globals.h --- iv-3.1/iv/src/examples/edraw/globals.h Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/globals.h Tue Apr 2 13:52:33 1996 @@ -0,0 +1,235 @@ +#ifndef globals_h +#define globals_h + +#include +#include +#include +#include +#include + +typedef long USec; +typedef long Sec; +typedef long PformerIndex; +typedef long PformerId; +typedef long PacerIndex; +typedef long Grade; + +class Pacer; +class Scheduler; + +declarePtrList(PacerList, Pacer); +declarePtrList(SchedulerList, Scheduler); + +class TimeSlice { +public: + TimeSlice(USec nat = -1, USec str = 0, USec shr = 0); + TimeSlice(const TimeSlice&); + + TimeSlice& operator = (const TimeSlice&); + boolean operator == (const TimeSlice&); + boolean operator != (const TimeSlice&); + USec min(); + USec max(); +public: + USec _nat, _str, _shr; +}; + +typedef unsigned int FadeType; +typedef int SessionID; + +enum { + no_fade = 0, fadein_low, fadein_high, fadeout_low, fadeout_high, sustain +}; + +FadeType fadetype (Grade cur, Grade fut, Grade low, Grade high); + +class RunTime { +public: + RunTime(); + +public: + Grade _cur_grade; + Grade _fut_grade; + + Sec _sec; + USec _usec, _period; + SessionID _id; +}; + +/* + * Alignment needs to be unsigned so that it can be stored + * as a bit field. + */ + +typedef unsigned Alignment; + +/* + * Use the concrete type (unsigned) instead of Alignment + * to get around cfront 2.1 incorrect warning. + */ + +static const unsigned TopLeft = 0; +static const unsigned TopCenter = 1; +static const unsigned TopRight = 2; +static const unsigned CenterLeft = 3; +static const unsigned Center = 4; +static const unsigned CenterRight = 5; +static const unsigned BottomLeft = 6; +static const unsigned BottomCenter = 7; +static const unsigned BottomRight = 8; +static const unsigned Left = 9; +static const unsigned Right = 10; +static const unsigned Top = 11; +static const unsigned Bottom = 12; +static const unsigned HorizCenter = 13; +static const unsigned VertCenter = 14; + +class PointObj { +public: + PointObj(Coord = 0, Coord = 0); + PointObj(PointObj*); + + Coord Distance(PointObj&); +public: + Coord _x, _y; +}; + +class LineObj { +public: + LineObj(Coord = 0, Coord = 0, Coord = 0, Coord = 0); + LineObj(LineObj*); + + boolean Contains(PointObj&); + int Same(PointObj& p1, PointObj& p2); + boolean Intersects(LineObj&); +public: + PointObj _p1, _p2; +}; + +class BoxObj { +public: + BoxObj(Coord = 0, Coord = 0, Coord = 0, Coord = 0); + BoxObj(BoxObj*); + + boolean operator==(BoxObj&); + boolean Contains(PointObj&); + boolean Intersects(BoxObj&); + boolean Intersects(LineObj&); + BoxObj operator-(BoxObj&); + BoxObj operator+(BoxObj&); + boolean Within(BoxObj&); +public: + Coord _l, _b, _r, _t; +}; + +class MultiLineObj { +public: + MultiLineObj(Coord* = nil, Coord* = nil, int = 0); + + void GetBox(BoxObj& b); + boolean Contains(PointObj&); + boolean Intersects(LineObj&); + boolean Intersects(BoxObj&); + boolean Within(BoxObj&); + void SplineToMultiLine(Coord* cpx, Coord* cpy, int cpcount); + void ClosedSplineToPolygon(Coord* cpx, Coord* cpy, int cpcount); +protected: + void GrowBuf(); + boolean CanApproxWithLine( + double x0, double y0, double x2, double y2, double x3, double y3 + ); + void AddLine(double x0, double y0, double x1, double y1); + void AddBezierArc( + double x0, double y0, double x1, double y1, + double x2, double y2, double x3, double y3 + ); + void CalcSection( + Coord cminus1x, Coord cminus1y, Coord cx, Coord cy, + Coord cplus1x, Coord cplus1y, Coord cplus2x, Coord cplus2y + ); +public: + Coord* _x, *_y; + int _count; +}; + +class FillPolygonObj : public MultiLineObj { +public: + FillPolygonObj(Coord* = nil, Coord* = nil, int = 0); + virtual ~FillPolygonObj(); + + boolean Contains(PointObj&); + boolean Intersects(LineObj&); + boolean Intersects(BoxObj&); +protected: + void Normalize(); +protected: + Coord* _normx, *_normy; + int _normCount; +}; + +class Extent { +public: + Extent(Coord = 0, Coord = 0, Coord = 0, Coord = 0, Coord = 0); + Extent(Extent&); + + boolean Undefined(); + boolean Within(Extent& e); + void Merge(Extent&); +public: + /* defines lower left and center of an object */ + Coord _l, _b, _cx, _cy, _tol; +}; + +/* + * inlines + */ + +inline boolean Extent::Undefined () { return _l == _cx && _l == _cy; } + +inline void exch (int& a, int& b) { + int temp = a; + a = b; + b = temp; +} + +inline int square(int a) { return a *= a; } +inline Coord square(Coord a) { return a *= a; } + +inline Coord degrees(Coord rad) { return rad * 180.0 / M_PI; } +inline Coord radians(Coord deg) { return deg * M_PI / 180.0; } + +inline Coord Distance(Coord x0, Coord y0, Coord x1, Coord y1) { + return sqrt(Coord(square(x0 - x1) + square(y0 - y1))); +} + +inline void ArrayCopy ( + const Coord* x, const Coord* y, int n, Coord* newx, Coord* newy +) { + Memory::copy(x, newx, n * sizeof(Coord)); + Memory::copy(y, newy, n * sizeof(Coord)); +} + +inline void ArrayDup ( + const Coord* x, const Coord* y, int n, Coord*& newx, Coord*& newy +) { + newx = new Coord[n]; + newy = new Coord[n]; + Memory::copy(x, newx, n * sizeof(Coord)); + Memory::copy(y, newy, n * sizeof(Coord)); +} + +inline void Midpoint ( + double x0, double y0, double x1, double y1, double& mx, double& my +) { + mx = (x0 + x1) / 2.0; + my = (y0 + y1) / 2.0; +} + +inline void ThirdPoint ( + double x0, double y0, double x1, double y1, double& tx, double& ty +) { + tx = (2*x0 + x1) / 3.0; + ty = (2*y0 + y1) / 3.0; +} + +#endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/glypheditor.c iv-3.1-g++2.7.2/iv/src/examples/edraw/glypheditor.c --- iv-3.1/iv/src/examples/edraw/glypheditor.c Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/glypheditor.c Tue Apr 2 13:52:34 1996 @@ -0,0 +1,624 @@ +/* + * glypheditor implementation + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "figure.h" +#include "glypheditor.h" +#include "glyphviewer.h" +#include "pacekeeper.h" +#include "idraw.h" + +static const char* tempfile = "/tmp/edraw"; + +class Displayer : public FieldEditor { +public: + Displayer( + const String& sample, WidgetKit*, Style*, FieldEditorAction* = nil + ); + virtual void press(const Event&); +}; + +Displayer::Displayer( + const String& sample, WidgetKit* w, Style* s, FieldEditorAction* fa +) : FieldEditor(sample, w, s, fa) {} + +void Displayer::press (const Event&) {} + +class BoundedValue : public Adjustable { +protected: + BoundedValue(); +public: + BoundedValue(Coord lower, Coord upper); + virtual ~BoundedValue(); + + virtual void lower_bound(Coord); + virtual void upper_bound(Coord); + virtual void current_value(Coord); + virtual void scroll_incr(Coord); + virtual void page_incr(Coord); + + virtual Coord lower(DimensionName) const; + virtual Coord upper(DimensionName) const; + virtual Coord length(DimensionName) const; + virtual Coord cur_lower(DimensionName) const; + virtual Coord cur_upper(DimensionName) const; + virtual Coord cur_length(DimensionName) const; + + virtual void scroll_to(DimensionName, Coord position); + virtual void scroll_forward(DimensionName); + virtual void scroll_backward(DimensionName); + virtual void page_forward(DimensionName); + virtual void page_backward(DimensionName); +private: + Coord curvalue_; + Coord lower_; + Coord span_; + Coord scroll_incr_; + Coord page_incr_; +}; + +BoundedValue::BoundedValue() { + scroll_incr_ = 0.0; + page_incr_ = 0.0; +} + +BoundedValue::BoundedValue(Coord lower, Coord upper) { + lower_ = lower; + span_ = upper - lower; + scroll_incr_ = span_ * 0.04; + page_incr_ = span_ * 0.4; + curvalue_ = (lower + upper) * 0.5; +} + +BoundedValue::~BoundedValue() { } + +void BoundedValue::lower_bound(Coord c) { lower_ = c; } +void BoundedValue::upper_bound(Coord c) { span_ = c - lower_; } + +void BoundedValue::current_value(Coord value) { + curvalue_ = value; + constrain(Dimension_X, curvalue_); + notify(Dimension_X); + notify(Dimension_Y); +} + +void BoundedValue::scroll_incr(Coord c) { scroll_incr_ = c; } +void BoundedValue::page_incr(Coord c) { page_incr_ = c; } + +Coord BoundedValue::lower(DimensionName) const { return lower_; } +Coord BoundedValue::upper(DimensionName) const { return lower_ + span_; } +Coord BoundedValue::length(DimensionName) const { return span_; } +Coord BoundedValue::cur_lower(DimensionName) const { return curvalue_; } +Coord BoundedValue::cur_upper(DimensionName) const { return curvalue_; } +Coord BoundedValue::cur_length(DimensionName) const { return 0; } + +void BoundedValue::scroll_to(DimensionName d, Coord position) { + Coord p = position; + constrain(d, p); + if (p != curvalue_) { + curvalue_ = p; + notify(Dimension_X); + notify(Dimension_Y); + } +} + +void BoundedValue::scroll_forward(DimensionName d) { + scroll_to(d, curvalue_ + scroll_incr_); +} + +void BoundedValue::scroll_backward(DimensionName d) { + scroll_to(d, curvalue_ - scroll_incr_); +} + +void BoundedValue::page_forward(DimensionName d) { + scroll_to(d, curvalue_ + page_incr_); +} + +void BoundedValue::page_backward(DimensionName d) { + scroll_to(d, curvalue_ - page_incr_); +} + +class Valuator : public MonoGlyph, public Observer { +public: + Valuator(BoundedValue*, Style*); + virtual ~Valuator(); + + virtual InputHandler* focusable() const; + + virtual void update(Observable*); + virtual void disconnect(Observable*); +private: + BoundedValue* bvalue_; + FieldEditor* editor_; + + void accept_editor(FieldEditor*); + void cancel_editor(FieldEditor*); +}; + +declareFieldEditorCallback(Valuator) +implementFieldEditorCallback(Valuator) + +Valuator::Valuator(BoundedValue* bv, Style* style) : MonoGlyph(nil) { + Style* s = new Style(style); + s->alias("Valuator"); + bvalue_ = bv; + bv->attach(Dimension_X, this); + editor_ = new Displayer( + String("9999"), WidgetKit::instance(), s, + new FieldEditorCallback(Valuator)( + this, &Valuator::accept_editor, &Valuator::cancel_editor + ) + ); + editor_->field("0.50"); + body(editor_); + update(bv->observable(Dimension_X)); +} + +Valuator::~Valuator() { + if (bvalue_ != nil) { + bvalue_->detach(Dimension_X, this); + } +} + +InputHandler* Valuator::focusable() const { + return editor_; +} + +float frame_dist; + +void Valuator::update(Observable*) { + Coord v = bvalue_->cur_lower(Dimension_X); + char buf[20]; + sprintf(buf, "%.2f", v); + editor_->field(buf); + frame_dist = v*300.0 + 2.0; +} + +void Valuator::disconnect(Observable*) { + bvalue_ = nil; +} + +void Valuator::accept_editor(FieldEditor*) { + Coord v; + const String& value = *editor_->text(); + if (value.convert(v)) { + bvalue_->current_value(v); + } +} + +void Valuator::cancel_editor(FieldEditor*) { + update(bvalue_->observable(Dimension_X)); +} + +/******************************************************/ +class CatalogButton : public Button { +public: + CatalogButton(Glyph*, Style*, TelltaleState*, Action*); + virtual ~CatalogButton(); + virtual void enter(); + virtual void leave(); +}; + +CatalogButton::CatalogButton( + Glyph* g, Style* s, TelltaleState* t, Action* a +) : Button(g, s, t, a) {} + +CatalogButton::~CatalogButton () {} + +void CatalogButton::enter () {} +void CatalogButton::leave () {} + +/******************************************************/ +class ToolCallback : public Action { +public: + ToolCallback(GlyphViewer*, unsigned int); + virtual void execute(); +private: + GlyphViewer* _gv; + unsigned _type; +}; + +ToolCallback::ToolCallback ( + GlyphViewer* gv, unsigned int t +) { + _gv = gv; + _type = t; +} + +void ToolCallback::execute () { + _gv->tool().tool(_type); +} + +/******************************************************/ +class PolicyCallback : public Action { +public: + PolicyCallback(GlyphViewer*, unsigned int); + virtual void execute(); +private: + GlyphViewer* _gv; + unsigned int _type; +}; + +PolicyCallback::PolicyCallback ( + GlyphViewer* gv, unsigned int t +) { + _gv = gv; + _type = t; +} + +void PolicyCallback::execute () { + _gv->set_policy(_type); +} + +/******************************************************/ +GlyphEditor::GlyphEditor () { + body(interior()); +} + +Glyph* GlyphEditor::interior () { + BoundedValue* bv = new BoundedValue(0.0, 1.0); + bv->current_value(0.5); + bv->scroll_incr(0.01); + bv->page_incr(0.1); + + LayoutKit* layout = LayoutKit::instance(); + WidgetKit* widget = WidgetKit::instance(); + + Style* s = new Style; + s->attribute("foreground", "black"); + s->attribute("font", "-*-times-bold-r-normal-*-14-*-*-*-*-*-*-*"); + widget->push_style(s); + + Glyph* label1 = widget->label("Policies"); + Glyph* label2 = widget->label("Tools"); + + widget->pop_style(); + + _gviewer = new GlyphViewer(600, 500); + return widget->inset_frame( + layout->vbox( + menus(), + layout->hbox( + layout->vbox( + widget->inset_frame( + _gviewer + ) + ), + widget->outset_frame( + layout->vbox( + layout->vglue(5, fil/2.0, 0), + layout->hmargin( + label1, + 1.0, fil/10, 0, 1.0, fil/10, 0 + ), + pacekeepers(), + layout->vglue(10, 0, 0), + layout->hmargin( + label2, + 1.0, fil/10, 0, 1.0, fil/10, 0 + ), + buttons(), + layout->vglue(10, 0, 0), + layout->vglue(20, fil, 0) + ) + ) + ) + ) + ); +} + +class Teller : public TelltaleState { +public: + Teller(const TelltaleFlags, Action*); + virtual void set(const TelltaleFlags, boolean); +protected: + Action* _action; +}; + +Teller::Teller(const TelltaleFlags f, Action* a) : TelltaleState (f) { + _action = a; +} + +void Teller::set (const TelltaleFlags f, boolean flag) { + if (flag && (f == is_active)) { + TelltaleState::set(is_active | is_chosen, flag); + if (_action != nil) { + _action->execute(); + } + } else if (!flag && f == is_chosen) { + TelltaleState::set(is_active | is_chosen, flag); + + } else if (!flag && f == is_active) { + + } else if (flag && f == is_chosen) { + + } else { + TelltaleState::set(f, flag); + } +} + +Button* GlyphEditor::make_tool ( + TelltaleGroup* teller, const char* label, unsigned int tool_id +) { + WidgetKit* widget = WidgetKit::instance(); + LayoutKit* layout = LayoutKit::instance(); + TelltaleFlags f = TelltaleState::is_enabled | TelltaleState::is_choosable; + + widget->begin_style("PushButton", "Button"); + Action* a = new ToolCallback( + _gviewer, tool_id + ); + TelltaleState* ts = new Teller(f, a); + ts->join(teller); + Button* tool = new CatalogButton( + widget->push_button_look( + layout->hmargin( + widget->label(label), 1.0, fil/10, 0, 1.0, fil/10, 0 + ), ts + ), + widget->style(), ts, nil + ); + widget->end_style(); + return tool; +} + +Button* GlyphEditor::make_policy ( + TelltaleGroup* teller, const char* label, unsigned int policy +) { + WidgetKit* widget = WidgetKit::instance(); + LayoutKit* layout = LayoutKit::instance(); + TelltaleFlags f = TelltaleState::is_enabled | TelltaleState::is_choosable; + + widget->begin_style("PushButton", "Button"); + Action* a = new PolicyCallback( + _gviewer, policy + ); + TelltaleState* ts = new Teller(f, a); + ts->join(teller); + Button* tool = new CatalogButton( + widget->push_button_look( + layout->hmargin( + widget->label(label), 1.0, fil/10, 0, 1.0, fil/10, 0 + ), ts + ), + widget->style(), ts, nil + ); + widget->end_style(); + return tool; +} + +Glyph* GlyphEditor::pacekeepers () { + LayoutKit* layout = LayoutKit::instance(); + TelltaleGroup* teller = new TelltaleGroup; + + Button* nopk = make_policy(teller, "None", PaceKeeper::NoPK); + Button* edriven = make_policy(teller, "Event Driven", PaceKeeper::EDriven); + Button* damposc = make_policy(teller, "Damped Osc", PaceKeeper::DampedOsc); + Button* pc = make_policy(teller, "Penalty/Credit", PaceKeeper::PC); + Button* coh = make_policy(teller, "Coherence", PaceKeeper::Coh); + + coh->state()->set(TelltaleState::is_active, true); + _gviewer->set_policy(PaceKeeper::Coh); + + return layout->vbox( + nopk, edriven, damposc, pc, coh + ); +} + +Glyph* GlyphEditor::buttons () { + LayoutKit* layout = LayoutKit::instance(); + TelltaleGroup* teller = new TelltaleGroup; + + Button* move = make_tool(teller, "Move", Tool::move); + Button* scale = make_tool(teller, "Scale", Tool::scale); + Button* rotate = make_tool(teller, "Rotate", Tool::rotate); + + move->state()->set(TelltaleState::is_active, true); + + return layout->vbox( + move, scale, rotate + ); +} + +void GlyphEditor::new_session () { + _gviewer->setrootgr(new PolyGraphic); +} + +void GlyphEditor::allocate (Canvas* c, const Allocation& a, Extension& ext) { + _w = c->window(); + MonoGlyph::allocate(c, a, ext); +} + +class Importer : public Action { +public: + Importer(GlyphEditor* ed); + virtual void execute(); +protected: + GlyphEditor* _ed; + static FileChooser* _chooser; +}; + +FileChooser* Importer::_chooser; + +Importer::Importer (GlyphEditor* ed) { _ed = ed; } + +void Importer::execute () { + Style* style; + boolean resetcaption = false; + if (_chooser == nil) { + style = new Style(Session::instance()->style()); + _chooser = DialogKit::instance()->file_chooser(".", style); + Resource::ref(_chooser); + char buf[256]; + sprintf(buf, "Select an idraw drawing to import:"); + style->attribute("caption", ""); + style->attribute("subcaption", buf); + } else { + style = _chooser->style(); + } + while (_chooser->post_for(_ed->window())) { + const String* s = _chooser->selected(); + InputFile* f = InputFile::open(*s); + if (f != nil) { + Graphic* gr = IdrawReader::load(f); + if (gr != nil) { + gr->flush(); + _ed->viewer()->setrootgr(gr); + delete f; + break; + } else { + style->attribute("caption", "Import failed!"); + resetcaption = true; + delete f; + } + } else { + unlink(tempfile); + char cmd[256]; + sprintf(cmd, "ls %s > %s", s->string(), tempfile); + system(cmd); + + String fname(tempfile); + f = InputFile::open(fname); + if (f != nil) { + long len = f->length(); + if (len == 0) { + delete f; + style->attribute("caption", "Import failed!"); + resetcaption = true; + } else { + char* buffer; + int len = f->read(buffer); + PolyGraphic* poly = new PolyGraphic; + + char* prev = buffer; + while(true) { + char* ptr = strchr(prev, '\n'); + if (ptr == nil || (buffer+len < ptr)) { + break; + } + CopyString str(prev, ptr-prev); + Graphic* gr = IdrawReader::load(str.string()); + if (gr != nil) { + poly->append_(gr); +/* + if (gr != poly->child_(0)) { + poly->child_(0)->align(Center, gr, Center); + } +*/ + } + prev = ptr+1; + } + if (poly->count_() == 0) { + delete f; + delete poly; + style->attribute("caption", "Import failed!"); + resetcaption = true; + } else { + poly->flush(); + + Transformer* tr = new Transformer; + for (long i = 0; i < poly->count_(); i++) { + Graphic* gr = poly->child_(i); + gr->transformer(tr); + } + tr->unref(); + long sel = poly->child_(0)->count_(); + for (long j = 0; j < sel; j++) { + tr = new Transformer; + for (i = 0; i < poly->count_(); i++) { + Graphic* gr = poly->child_(i)->child_(j);; + gr->transformer(tr); + } + tr->unref(); + } + _ed->viewer()->setrootgr(poly); + delete f; + break; + } + } + } else { + style->attribute("caption", "Import failed!"); + resetcaption = true; + } + } + } + if (resetcaption) { + style->attribute("caption", ""); + } +} + +class QuitAction : public Action { +public: + QuitAction(); + virtual void execute(); +}; + +QuitAction::QuitAction () {} + +void QuitAction::execute () { WidgetKit::instance()->quit()->execute(); } + +class Cleaner : public Action { +public: + Cleaner(GlyphEditor* ed); + virtual void execute(); +protected: + GlyphEditor* _ed; +}; + +Cleaner::Cleaner (GlyphEditor* ed) { + _ed = ed; +} + +void Cleaner::execute () { + _ed->new_session(); +} + +Glyph* GlyphEditor::menus () { + WidgetKit* widget = WidgetKit::instance(); + + Menu* mb = widget->menubar(); + MenuItem* mi = widget->menubar_item("File"); + Menu* pulldown = widget->pulldown(); + MenuItem* cleaner = widget->menu_item("Purge"); + MenuItem* import = widget->menu_item("Import"); + MenuItem* quit = widget->menu_item("Quit"); + cleaner->action(new Cleaner(this)); + import->action(new Importer(this)); + quit->action(new QuitAction); + + mb->append_item(mi); + mi->menu(pulldown); + pulldown->append_item(import); + pulldown->append_item(cleaner); + pulldown->append_item(widget->menu_item_separator()); + pulldown->append_item(quit); + + return mb; +} + diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/glypheditor.h iv-3.1-g++2.7.2/iv/src/examples/edraw/glypheditor.h --- iv-3.1/iv/src/examples/edraw/glypheditor.h Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/glypheditor.h Tue Apr 2 13:52:34 1996 @@ -0,0 +1,36 @@ +/* + * glypheditor - a simple drawing editor-like application for tutorial purposes + */ + +#include + +class Button; +class GlyphViewer; +class TelltaleGroup; +class Window; + +class GlyphEditor : public MonoGlyph { +public: + GlyphEditor(); + Window* window(); + GlyphViewer* viewer(); + + void new_session(); + void quit(); + + virtual void allocate(Canvas*, const Allocation&, Extension&); +protected: + Button* make_tool(TelltaleGroup*, const char*, unsigned int); + Button* make_policy(TelltaleGroup*, const char*, unsigned int); +protected: + GlyphViewer* _gviewer; + Window* _w; +private: + Glyph* interior(); + Glyph* buttons(); + Glyph* pacekeepers(); + Glyph* menus(); +}; + +inline Window* GlyphEditor::window () { return _w; } +inline GlyphViewer* GlyphEditor::viewer () { return _gviewer; } diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/glyphviewer.c iv-3.1-g++2.7.2/iv/src/examples/edraw/glyphviewer.c --- iv-3.1/iv/src/examples/edraw/glyphviewer.c Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/glyphviewer.c Tue Apr 2 13:52:34 1996 @@ -0,0 +1,788 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include + +#include +#include +#include "figure.h" +#include "figureview.h" +#include "globals.h" +#include "glyphviewer.h" + +#include "pacer.h" +#include "pacemaker.h" +#include "pacekeeper.h" +#include "gcollector.h" + +static const long LEVELS = 6; + +static long count_leaves (Pacer* p) { + long count = 0; + if (p->count() > 0) { + for (long i = 0; i < p->count(); i++) { + Pacer* kid = p->child(i); + count += count_leaves(kid); + } + } else { + count = 1; + } + return count; +} + +static long inc; +static long cur_inc; +static long cur_level; + +static void RecurAutoGrade(Pacer* p) { + if (p->count() > 0) { + for (long i = 0; i < p->count(); i++) { + Pacer* kid = p->child(i); + RecurAutoGrade(kid); + } + } else { + cur_inc--; + if (cur_inc < 0) { + cur_inc = inc; + if (cur_level > 0) { + cur_level--; + } + } + GraphicPacer* gp = (GraphicPacer*) p; + gp->set_grades(0, cur_level); + } +} + +static void AutoGrade (Pacer* p) { + long count = count_leaves(p); + + cur_level = LEVELS-1; + inc = count/LEVELS; + cur_inc = count/LEVELS; + + RecurAutoGrade(p); +} + +static Pacer* CreatePacers(Canvas* c, Graphic* gr) { + Pacer* d; + if (gr->count_() > 0) { + d = new Grader(new Distributor); + for (GlyphIndex i = 0; i < gr->count_(); i++) { + d->append(CreatePacers(c, gr->child_(i))); + } + } else { + d = new GraphicPacer(c, gr); + } + return d; +} + +static BoxObj allot; + +static void effect (ViewAction* action, BoxObj& box) { + Graphic* gr; + Coord l, b, r, t; + + gr = action->target(); + gr->getbounds(l, b, r, t); + BoxObj before(l, b, r, t); + action->execute(); + gr->getbounds(l, b, r, t); + BoxObj after(l, b, r, t); + box = before+after; + box = allot-box; + +// a hack to get around xor dudus + Coord pad = 5.0; + box._l -= pad; + box._b -= pad; + box._r += pad; + box._t += pad; +} + +class ClearAction : public Action { +public: + ClearAction(); + virtual void execute(); +}; + +ClearAction::ClearAction () {} + +void ClearAction::execute () { GraphicPacer::clear(); } + +class ContAction : public Action { +public: + ContAction(ViewAction*, Pacer*); + virtual ~ContAction(); + + virtual void execute(); +protected: + ViewAction* _vaction; + Pacer* _pacer; +}; + +ContAction::ContAction ( + ViewAction* vaction, Pacer* pacer +) { + _vaction = vaction; + Resource::ref(_vaction); + _pacer = pacer; +} + +ContAction::~ContAction () { + Resource::unref(_vaction); +} + +void ContAction::execute () { + BoxObj box; + if (_vaction != nil) { + effect(_vaction, box); + + for (long i = 0; i < _pacer->count(); i++) { + FCGraphicPacer* fc = (FCGraphicPacer*) _pacer->child(i); + fc->incur(box); + } + } +} + +class FullFixer : public GraphicPacer { +public: + FullFixer(Canvas* c, Graphic* _gr, const Color* fill); + + virtual void set_graphic(Graphic*); + void set_clipped (BoxObj&); + virtual void play(RunTime&); +protected: + void xor(); +protected: + BoxObj _allot; + const Color* _fill; + + Color* _color; + Brush* _brush; + BoxObj _box; + Transformer* _t; + boolean _drawn; +}; + +inline void FullFixer::set_clipped(BoxObj& allot) { _allot = allot; } + +FullFixer::FullFixer ( + Canvas* c, Graphic* gr, const Color* fill +) : GraphicPacer (c, gr) { + _fill = fill; + Resource::ref(_fill); + + _color = new Color(*fill, 1.0, Color::Xor); + _color->ref(); + _brush = new Brush(0.0); + _brush->ref(); + _drawn = false; + + set_graphic(gr); +} + +void FullFixer::set_graphic(Graphic* gr) { + GraphicPacer::set_graphic(gr); + _t = new Transformer; + + _gr->eqv_transformer(*_t); + _gr->getbounds(_box._l, _box._b, _box._r, _box._t); + _t->inverse_transform(_box._l, _box._b); + _t->inverse_transform(_box._r, _box._t); +} + +void FullFixer::xor () { + boolean doit = false; + if (!_drawn) { + _drawn = true; + doit = true; + } else { + doit = true; + _drawn = false; + } + if (doit) { + _canvas->push_clipping(); + _canvas->clip_rect(_allot._l, _allot._b, _allot._r, _allot._t); + _canvas->front_buffer(); + _canvas->push_transform(); + _canvas->transform(*_t); + _canvas->rect( + _box._l, _box._b, _box._r, _box._t, _color, _brush + ); + _canvas->pop_transform(); + _canvas->pop_clipping(); + _canvas->back_buffer(); + } +} + +void FullFixer::play (RunTime&) { +/* + CanvasRep* crep = _canvas->rep(); + BoxObj box = _allot-_damage; + + _canvas->damage(box._l, box._b, box._r, box._t); + crep->start_repair(); + //_canvas->fill_rect(_damage._l, _damage._b, _damage._r, _damage._t, _fill); + //_gr->drawclipped(_canvas,_damage._l, _damage._b, _damage._r, _damage._t); + + _gr->alpha_fill(true); + _gr->alpha_stroke(true); + + _gr->drawclipped(_canvas,_damage._l, _damage._b, _damage._r, _damage._t); + + _gr->alpha_fill(false); + _gr->alpha_stroke(false); +*/ + + if (_drawn) { + xor(); + _drawn = false; + } + _gr->eqv_transformer(*_t); + xor(); + GraphicPacer::clear(); +} + +class GlyphGrabber : public Handler { +public: + GlyphGrabber(GlyphViewer*, Graphic* master); + virtual ~GlyphGrabber(); + + virtual boolean event(Event&); +protected: + boolean _busy; + int _orig_tool; + + PaceMaker* _pmaker; + + PaceKeeper* _contkeeper; + PaceKeeper* _ekeeper; + PaceKeeper* _dampedkeeper; + PaceKeeper* _pckeeper; + PaceKeeper* _cohkeeper; + + GlyphViewer* _gviewer; + Graphic* _master; + + + UIScheduler* _ui; + ActionPacer* _view0; + Grader* _gp00; + + Grader* _view1; + ActionPacer* _action; + Clipper* _clipper10; + Clipper* _clipper11; + + Repairer* _fixer; + Repairer* _filler; + + SelectPacer* _selector; + + Grader* _gp10; + Grader* _gp11; + + boolean _continue; + boolean _control_is_down; + + XorPacer* _xor; +}; + +GlyphGrabber::GlyphGrabber (GlyphViewer* gviewer, Graphic* master) { + _gviewer = gviewer; + + _busy = false; + _orig_tool = -1; + _master = master; + + Resource::ref(_master); + + const Color* bg = gviewer->getroot()->background(); + Canvas* canvas = gviewer->canvas(); + + _ui = new UIScheduler(new DragMapper); + + _view0 = new ActionPacer; + _gp00 = new Grader(new Tiler); + + _view0->set_kid(_gp00); + for (long i = 0; i < _master->count_(); i++) { + _gp00->append(new FCGraphicPacer(canvas, _master->child_(i), bg)); + } + _view1 = new Grader(new Tiler); + + _fixer = new Fixer(canvas, _master->child_(0)); + _filler = new Filler(canvas, _master->child_(0), bg); + + _action = new ActionPacer(nil, new ClearAction); + + _selector = new SelectPacer(canvas, _master); + _selector->set_damaged(&GraphicPacer::damaged_area()); + + _clipper10 = new Clipper(canvas, &_fixer->damaged_area()); + _clipper11 = new Clipper(canvas, &GraphicPacer::damaged_area()); + + _gp10 = new Grader(new Normalizer); + _gp11 = new Grader(new Tiler); + + _view1->append(_clipper10); + _clipper10->set_kid(_action); + + _action->set_kid(_gp10); + + _gp10->append(_filler); + _gp10->append(_fixer); + + _view1->append(_selector); + _selector->set_kid(_clipper11); + + _clipper11->set_kid(_gp11); + + _xor = new XorPacer(canvas, nil, bg); + //_view1->append(_xor); + + _contkeeper = new Continuator(_ui); + _ekeeper = new EventKeeper(_ui); + _dampedkeeper = new DampedKeeper(_ui); + _pckeeper = new PCKeeper(_ui); + _cohkeeper = new CoherenceKeeper(_ui); + + _pmaker = new PaceMaker(_cohkeeper); +} + +GlyphGrabber::~GlyphGrabber () { + Resource::unref(_master); + _ui->set_kid(nil); + delete _ui; + delete _contkeeper; + delete _ekeeper; + delete _dampedkeeper; + delete _pckeeper; + delete _cohkeeper; + + delete _view0; + delete _view1; +} + +class SelGraphic : public PolyGraphic { +public: + SelGraphic(); + + virtual void append_(Graphic*); + virtual void prepend_(Graphic*); + virtual void insert_(GlyphIndex, Graphic*); + virtual void remove_(GlyphIndex); + virtual void remove_(Graphic*); + virtual void replace_(GlyphIndex, Graphic*); +}; + +SelGraphic::SelGraphic() {} + +void SelGraphic::append_ (Graphic* g) { + _body->append(g); +} + +void SelGraphic::prepend_ (Graphic* g) { + _body->prepend(g); +} + +void SelGraphic::insert_ (GlyphIndex i, Graphic* g) { + _body->insert(i, g); +} + +void SelGraphic::remove_ (GlyphIndex i) { + _body->remove(i); +} + +void SelGraphic::remove_ (Graphic* gr) { + PolyGraphic::remove_(gr); +} + +void SelGraphic::replace_ (GlyphIndex i, Graphic* g) { + _body->replace(i, g); +} + +boolean GlyphGrabber::event (Event& e) { + RootView* rv = _gviewer->getroot(); + Canvas* canvas = _gviewer->canvas(); + const Allocation& a = _gviewer->allocation(); + if (e.type() == Event::down && !_busy) { + _busy = true; + Display* d = e.display(); + Canvas* c = e.window()->canvas(); + + d->grab(e.window(), this); + _orig_tool = -1; + + ViewAction* action = nil; + BoxObj box(a.left(), a.bottom(), a.right(), a.top()); + + Tool& tool = _gviewer->tool(); + _control_is_down = e.control_is_down(); + + if (_control_is_down) { + _ui->set_kid(_view0); + for (long i = 0; i < _gp00->count(); i++) { + FCGraphicPacer* fc = (FCGraphicPacer*) _gp00->child(i); + fc->set_clipped(box); + } + e.poll(); + _orig_tool = tool.tool(); + if (e.left_is_down()) { + tool.tool(Tool::rate_scroll); + _ui->set_mapper(new ContMapper); + _continue = rv->grasp(e, tool, action); + _view0->set_before( + new ContAction(action, _gp00) + ); + } else if (e.middle_is_down()) { + tool.tool(Tool::grab_scroll); + _continue = rv->grasp(e, tool, action); + _ui->set_mapper(new DragMapper); + _view0->set_before(nil); + + } else if (e.right_is_down()) { + tool.tool(Tool::rate_zoom); + _continue = rv->grasp(e, tool, action); + ContMapper* mapper = new ContMapper; + mapper->set_dimension(Cont_Y); + _ui->set_mapper(mapper); + _view0->set_before( + new ContAction(action, _gp00) + ); + } + } else { + _ui->set_kid(_view1); + _ui->set_mapper(new DragMapper); + + _clipper10->set_clipped(box); + _clipper11->set_clipped(box); + _selector->set_clipped(box); + + _continue = rv->grasp(e, tool, action); + } + _ui->cur_event(e); + + if (_continue && action != nil) { + BoxObj box; + + if (action->executable()) { + effect(action, box); + if (_control_is_down) { + for (long i = 0; i < _gp00->count(); i++) { + FCGraphicPacer* fc = + (FCGraphicPacer*) _gp00->child(i); + fc->incur(box); + } + } else { + GraphicPacer::incur(box); + _fixer->incur(box); + _filler->incur(box); + } + } + } + if (!_control_is_down) { + _gp11->delete_all(); + + const TargetList* t = rv->cur_targets(); + long count = t->count(); + if (count == 1 && t->item_ref(0)._target == rv->getgraphic()) { + /* not supported */ + } else { + if (count == 1) { + for (long i = 0; i < _master->count_(); i++) { + Graphic* sel = _master->child_(i)->child_( + t->item_ref(0)._index + ); + _gp11->append(new GraphicPacer(canvas, sel)); + } + Graphic* sel = _master->child_(0)->child_( + t->item_ref(0)._index + ); + //_xor->set_clipped(box); + //_xor->set_graphic(sel); + } else { + /* not supported */ + } + } + + } + _ui->regrade(); + switch(_gviewer->get_policy()) { + case PaceKeeper::NoPK: + _pmaker->set_pacekeeper(_contkeeper); + break; + case PaceKeeper::EDriven: + _pmaker->set_pacekeeper(_ekeeper); + break; + case PaceKeeper::DampedOsc: + _pmaker->set_pacekeeper(_dampedkeeper); + break; + case PaceKeeper::PC: + _pmaker->set_pacekeeper(_pckeeper); + break; + case PaceKeeper::Coh: + _pmaker->set_pacekeeper(_cohkeeper); + break; + default: + _pmaker->set_pacekeeper(_cohkeeper); + break; + } + + _pmaker->startall(); + + } else if (e.type() == Event::up && _busy) { + _busy = false; + + Display* d = e.display(); + d->ungrab(this); + Canvas* c = e.window()->canvas(); + + if (_continue) { + ViewAction* action = nil; + rv->effect(e, _gviewer->tool(), action); + if (action != nil) { + BoxObj box; + + if (action->executable()) { + effect(action, box); + if (_control_is_down) { + for (long i = 0; i < _gp00->count(); i++) { + FCGraphicPacer* fc = + (FCGraphicPacer*) _gp00->child(i); + fc->incur(box); + } + } else { + GraphicPacer::incur(box); + _fixer->incur(box); + _filler->incur(box); + //_xor->incur(box); + } + } + action->unref(); + } + } + _ui->cur_event(e); + d->ungrab(this); + _pmaker->stopall(); + + Canvas* canvas = _gviewer->canvas(); + canvas->damage_all(); + + const Allocation& a = _gviewer->allocation(); + + canvas->fill_rect( + a.left(), a.bottom(), a.right(), a.top(), + _gviewer->getroot()->background() + ); + _gviewer->getroot()->getgraphic()->draw(canvas, a); + + _fixer->clear(); + _filler->clear(); + GraphicPacer::clear(); + for (long i = 0; i < _gp00->count(); i++) { + FCGraphicPacer* fc = (FCGraphicPacer*) _gp00->child(i); + fc->clear(); + } + + if (_orig_tool >= 0) { + Tool& tool = _gviewer->tool(); + tool.tool(_orig_tool); + _orig_tool = -1; + } + + } else if (_busy) { + if (_continue) { + Canvas* c = e.window()->canvas(); + ViewAction* action = nil; + _continue = rv->manipulating(e, _gviewer->tool(), action); + if (action != nil) { + if (action->executable()) { + BoxObj box; + effect(action, box); + + if (_control_is_down) { + for (long i = 0; i < _gp00->count(); i++) { + FCGraphicPacer* fc = + (FCGraphicPacer*) _gp00->child(i); + fc->incur(box); + } + } else { + GraphicPacer::incur(box); + _fixer->incur(box); + _filler->incur(box); + //_xor->incur(box); + } + } + Tool& tool = _gviewer->tool(); + if (_control_is_down && tool.tool() != Tool::grab_scroll) { + _view0->set_before( + new ContAction(action, _gp00) + ); + } + action->unref(); + } + _ui->cur_event(e); + } + } + return true; +} + +GlyphViewer::GlyphViewer( + float w, float h +) : MonoGlyph(nil) { + _canvas = nil; + + _root = new RootView; + _root->ref(); + _root->viewer(this); + _root->background(new Color(1.0, 1.0, 1.0, 1.0)); + + _width = w; + _height = h; + + _grabber = nil; + + body(new Target(_root->getrootgr(),TargetAlwaysHit)); + + initshape(); + initgraphic(); +} + +GlyphViewer::~GlyphViewer () { + _grabber->unref(); + _root->unref(); +} + +Tool& GlyphViewer::tool () { + return _tool; +} + +void GlyphViewer::set_policy (unsigned int policy) { + _policy = policy; +} + +unsigned int GlyphViewer::get_policy () { + return _policy; +} + +RootView* GlyphViewer::getroot () { return _root; } + +void GlyphViewer::setrootgr (Graphic* root) { + if (root != _root->getgraphic()) { + Extension ext; + Allocation a; + + _master = root; + + if (_master->count_() > 0) { + _root->setgraphic(root->child_(0)); + } else { + _root->setgraphic(nil); + } + root = _root->getrootgr(); + root->transformer(nil); + body(new Target(root, TargetAlwaysHit)); + + initgraphic(); + Canvas* c = canvas(); + if (c != nil) { + Requisition req; + root->request(req); + root->allocate(c, _a, ext); + } + Resource::unref(_grabber); + if (_master->count_() > 0) { + _grabber = new GlyphGrabber(this, _master); + } else { + _grabber = nil; + } + Resource::ref(_grabber); + } +} + +void GlyphViewer::initshape () { + if (_width < -0.5 && _height < -0.5) { + Coord l, b, r, t; + _root->getgraphic()->getbounds(l, b, r, t); + _width = r - l; + _height = t - b; + } + Allotment& ax = _a.x_allotment(); + Allotment& ay = _a.y_allotment(); + ax.span(_width); + ay.span(_height); +} + +void GlyphViewer::initgraphic () { + Coord l, b, r, t; + _root->getgraphic()->getbounds(l, b, r, t); + _root->getgraphic()->translate(-l-(r-l)/2.0, -b-(t-b)/2.0); + +/* + if (_master->count_() > 0) { + Graphic* ref = _master->child_(0); + for (long i = 1; i < _master->count_(); i++) { + ref->align(Center, _master->child_(i), Center); + } + } +*/ + Canvas* c = canvas(); + if (c != nil) { + c->damage_all(); + } +} + +void GlyphViewer::allocate(Canvas* c, const Allocation& a, Extension& ext) { + _canvas = c; + _a = a; + allot._l = _a.left(); + allot._b = _a.bottom(); + allot._r = _a.right(); + allot._t = _a.top(); + + MonoGlyph::allocate(c, a, ext); + ext.merge(c, a); +} + +void GlyphViewer::request(Requisition& req) const { + Requirement& rx = req.x_requirement(); + rx.natural(_width); + rx.stretch(fil); + rx.shrink(_width); + rx.alignment(0.0); + + Requirement& ry = req.y_requirement(); + ry.natural(_height); + ry.stretch(fil); + ry.shrink(0.0); + ry.alignment(0.0); +} + +void GlyphViewer::draw(Canvas* c, const Allocation& a) const { + _root->getrootgr()->draw(c, a); +} + +void GlyphViewer::pick(Canvas* c, const Allocation& a, int depth, Hit& h) { + const Event* e = h.event(); + if (e->type() == Event::down && _grabber != nil) { + h.begin(depth, this, 0, _grabber); + MonoGlyph::pick(c, a, depth, h); + h.end(); + } +} + diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/glyphviewer.h iv-3.1-g++2.7.2/iv/src/examples/edraw/glyphviewer.h --- iv-3.1/iv/src/examples/edraw/glyphviewer.h Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/glyphviewer.h Tue Apr 2 13:52:34 1996 @@ -0,0 +1,59 @@ +/* + * GlyphViewer + */ + +#ifndef glyphviewer_h +#define glyphviewer_h + +#include +#include +#include "figureview.h" + +class Canvas; +class Color; +class Cursor; +class GlyphGrabber; +class PaceMaker; +class RootGraphic; + +class GlyphViewer : public MonoGlyph { +public: + GlyphViewer(float w = -1.0, float h = -1.0); + virtual ~GlyphViewer(); + + virtual void request(Requisition&) const; + virtual void allocate(Canvas*, const Allocation&, Extension&); + virtual void draw(Canvas*, const Allocation&) const; + virtual void pick(Canvas*, const Allocation&, int depth, Hit&); + + virtual Tool& tool(); + + void set_policy(unsigned int); + unsigned int get_policy(); + + RootView* getroot(); + void setrootgr(Graphic*); + + const Allocation& allocation() const; + Canvas* canvas() const; +protected: + void initshape(); + void initgraphic(); +protected: + float _width, _height; + Allocation _a; + + RootView* _root; + Tool _tool; + GlyphGrabber* _grabber; + Canvas* _canvas; + Graphic* _master; + unsigned int _policy; + + const Color* _bg; +}; + +inline const Allocation& GlyphViewer::allocation () const { return _a; } +inline Canvas* GlyphViewer::canvas () const { return _canvas; } + +#endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/grabber.bm iv-3.1-g++2.7.2/iv/src/examples/edraw/grabber.bm --- iv-3.1/iv/src/examples/edraw/grabber.bm Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/grabber.bm Tue Apr 2 13:52:34 1996 @@ -0,0 +1,8 @@ +#define grabber_width 16 +#define grabber_height 16 +#define grabber_x_hot 2 +#define grabber_y_hot 7 +static char grabber_bits[] = { + 0x00, 0x00, 0x80, 0x03, 0x60, 0x0e, 0x90, 0x14, 0x08, 0x29, 0x64, 0x52, + 0x98, 0xe4, 0x04, 0x85, 0x8a, 0x80, 0x9a, 0x80, 0x62, 0x40, 0x04, 0x40, + 0x08, 0x20, 0x10, 0x20, 0x60, 0x10, 0x40, 0x10}; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/grabberMask.bm iv-3.1-g++2.7.2/iv/src/examples/edraw/grabberMask.bm --- iv-3.1/iv/src/examples/edraw/grabberMask.bm Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/grabberMask.bm Tue Apr 2 13:52:34 1996 @@ -0,0 +1,8 @@ +#define grabberMask_width 16 +#define grabberMask_height 16 +#define grabberMask_x_hot 2 +#define grabberMask_y_hot 7 +static char grabberMask_bits[] = { + 0x00, 0x00, 0x80, 0x03, 0xe0, 0x0f, 0xf0, 0x1f, 0xf8, 0x3f, 0xfc, 0x7f, + 0x98, 0xff, 0x04, 0xff, 0x8e, 0xff, 0x9e, 0xff, 0xfe, 0x7f, 0xfc, 0x7f, + 0xf8, 0x3f, 0xf0, 0x3f, 0xe0, 0x1f, 0xc0, 0x1f}; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/idraw.c iv-3.1-g++2.7.2/iv/src/examples/edraw/idraw.c --- iv-3.1/iv/src/examples/edraw/idraw.c Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/idraw.c Tue Apr 2 13:52:34 1996 @@ -0,0 +1,532 @@ +/* + * Read an idraw drawing from a file + */ + +#include "figure.h" +#include "idraw.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +class BrushInfo { +public: + const Brush* brush_; + int width_; + int pattern_; +}; + +declareList(BrushInfoList,BrushInfo) +implementList(BrushInfoList,BrushInfo) + +class Stipple : public Resource { +public: + Stipple(float dither); + + float dither_; +protected: + virtual ~Stipple (); +}; + +Stipple::Stipple (float dither) { + dither_ = dither; +} + +Stipple::~Stipple () { } + +declarePtrList(StippleList,Stipple) +implementPtrList(StippleList,Stipple) + +static Stipple* no_stipple = (Stipple*) -1; + +struct FigureInfo { + const char* name; + boolean brush; + boolean foreground; + boolean background; + boolean font; + boolean pattern; + boolean transformer; + int coords; + int skip; +}; + +static FigureInfo early_info[] = { + { "Idraw", 1, 1, 1, 1, 1, 1, 0, 0 }, + { "BSpl", 1, 1, 1, 0, 1, 1, -1, 0 }, + { "Circ", 1, 1, 1, 0, 1, 1, 1, 0 }, + { "CBSpl", 1, 1, 1, 0, 1, 1, -1, 0 }, + { "Elli", 1, 1, 1, 0, 1, 1, 1, 0 }, + { "Line", 1, 1, 1, 0, 1, 1, 2, 0 }, + { "MLine", 1, 1, 1, 0, 1, 1, -1, 0 }, + { "Pict", 1, 1, 1, 1, 1, 1, 0, 0 }, + { "Poly", 1, 1, 1, 0, 1, 1, -1, 0 }, + { "Rect", 1, 1, 1, 0, 1, 1, 2, 0 }, + { "Text", 0, 1, 0, 1, 0, 1, 0, 0 }, + { "eop", 0, 0, 0, 0, 0, 0, 0, 0 }, + { nil, 0, 0, 0, 0, 0, 0, 0 } +}; + +static FigureInfo version_10_info[] = { + { "Idraw", 1, 1, 1, 1, 1, 1, 0, 0 }, + { "BSpl", 1, 1, 1, 0, 1, 1, -1, 1 }, + { "Circ", 1, 1, 1, 0, 1, 1, 1, 0 }, + { "CBSpl", 1, 1, 1, 0, 1, 1, -1, 0 }, + { "Elli", 1, 1, 1, 0, 1, 1, 1, 0 }, + { "Line", 1, 1, 1, 0, 1, 1, 2, 1 }, + { "MLine", 1, 1, 1, 0, 1, 1, -1, 1 }, + { "Pict", 1, 1, 1, 1, 1, 1, 0, 0 }, + { "Poly", 1, 1, 1, 0, 1, 1, -1, 0 }, + { "Rect", 1, 1, 1, 0, 1, 1, 2, 0 }, + { "Text", 0, 1, 0, 1, 0, 1, 0, 0 }, + { "eop", 0, 0, 0, 0, 0, 0, 0, 0 }, + { nil, 0, 0, 0, 0, 0, 0, 0, 0 } +}; + +class IdrawReaderImpl { +public: + friend class IdrawReader; + IdrawReaderImpl(); + virtual ~IdrawReaderImpl(); + + InputFile* file_; + int version_; + FigureInfo* figinfo_; + const char* start_; + const char* end_; + const char* cur_; + BrushInfoList brushes_; + StippleList stipples_; + static Brush* no_brush; + + Graphic* load( + const Brush* pb, const Color* pfg, const Color* pbg, + const Font* pf, const Stipple* ps + ); + boolean fill(); + boolean read(String&); + boolean read(char&); + boolean read(int&); + boolean read(float&); + const Brush* read_brush(); + const Color* read_color(); + const Font* read_font(); + const Stipple* read_stipple(); + Transformer* read_transformer(); + const Color* dither_color(const Color* fg, const Color* bg, float dither); + void skip(); +}; + +Brush* IdrawReaderImpl::no_brush = (Brush*)-1; + +IdrawReaderImpl::IdrawReaderImpl () {} + +IdrawReaderImpl::~IdrawReaderImpl () { + for (ListItr(BrushInfoList) i(brushes_); i.more(); i.next()) { + BrushInfo& br = i.cur_ref(); + Resource::unref(br.brush_); + } + for (ListItr(StippleList) j(stipples_); j.more(); j.next()) { + const Stipple* st = j.cur(); + Resource::unref(st); + } +} + +Graphic* IdrawReader::load(InputFile* f) { + IdrawReaderImpl impl_; + impl_.file_ = f; + impl_.start_ = nil; + impl_.end_ = nil; + impl_.cur_ = nil; + return impl_.load(nil, nil, nil, nil, nil); +} + +Graphic* IdrawReader::load(const char* filename) { + Graphic* gm = nil; + String s(filename); + InputFile* input = InputFile::open(s); + if (input != nil) { + gm = load(input); + delete input; + } + return gm; +} + +Graphic* IdrawReaderImpl::load( + const Brush* pb, const Color* pfg, const Color* pbg, + const Font* pf, const Stipple* ps +) { + Session* session = Session::instance(); + Style* style = session->style(); + skip(); + Transformer* tx = nil; + Graphic* glyph = nil; + String name; + if (read(name)) { + if (name == "Idraw") { + read(version_); + figinfo_ = version_ < 10 ? early_info : version_10_info; + } + FigureInfo* fig; + for (fig = &figinfo_[0]; fig->name != nil; fig++) { + if (name == fig->name) { + break; + } + } + const Brush* b = fig->brush ? read_brush() : nil; + const Color* fg = fig->foreground ? read_color() : nil; + const Color* bg = fig->background ? read_color() : nil; + const Font* f = fig->font ? read_font() : nil; + const Stipple* s = fig->pattern ? read_stipple() : nil; + if (fig->transformer) { + tx = read_transformer(); + } + + if (b != no_brush) { + Resource::ref(b); + } + Resource::ref(fg); + Resource::ref(bg); + Resource::ref(f); + if (s != no_stipple) { + Resource::ref(s); + } + + if (pb) { + if (pb != no_brush) { + Resource::ref(pb); + } + if (b != no_brush) { + Resource::unref(b); + } + b = pb; + } + if (pfg) { + Resource::ref(pfg); + Resource::unref(fg); + fg = pfg; + } + if (pbg) { + Resource::ref(pbg); + Resource::unref(bg); + bg = pbg; + } + if (pf) { + Resource::ref(pf); + Resource::unref(f); + f = pf; + } + if (ps) { + if (ps != no_stipple) { + Resource::ref(ps); + } + if (s != no_stipple) { + Resource::unref(s); + } + s = ps; + } + + String figname(fig->name); + if (fig->name == nil) { + ; // error + } else if (figname == "Idraw" || figname == "Pict") { + PolyGraphic* pg = new PolyGraphic; + pg->transformer(tx); + for (;;) { + Graphic* g = load(b, fg, bg, f, s); + if (g == nil) { + break; + } + pg->append_(g); + } + glyph = pg; + + } else if (figname == "eop") { + glyph = nil; + } else if (figname == "Text") { + skip(); + String s; + read(s); + char ch; + read(ch); + + int bufsize = 256; + char* buf = new char[bufsize]; + int i = 0; + while (read(ch) && ch != ']') { + buf[i++] = ch; + if (i == bufsize) { + bufsize = bufsize*2; + char* newbuf = new char[bufsize]; + Memory::copy(buf, newbuf, i*sizeof(char)); + delete buf; + buf = newbuf; + } + } + buf[i] = '\0'; + glyph = new Text(f, fg, buf, tx); + delete buf; + } else { + skip(); + int c = fig->coords; + if (c == -1) { + read(c); + } + Coord* x = new Coord[c]; + Coord* y = new Coord[c]; + float xx, yy; + for (int i = 0; i < c; ++i) { + read(xx); + read(yy); + x[i] = xx; + y[i] = yy; + } + + const Brush* brush = (b != no_brush) ? b : nil; + const Color* stroke = fg; + const Color* fill = ( + (s != no_stipple) ? dither_color(fg, bg, s->dither_) : nil + ); + Resource::ref(brush); + Resource::ref(stroke); + Resource::ref(fill); + + if (figname == "Line") { + glyph = new Line( + brush, stroke, fill, x[0], y[0], x[1], y[1], tx + ); + } else if (figname == "BSpl") { + glyph = new Open_BSpline(brush, stroke, fill, x, y, c, tx); + } else if (figname == "CBSpl") { + glyph = new Closed_BSpline(brush, stroke, fill, x, y, c, tx); + } else if (figname == "MLine") { + glyph = new Polyline(brush, stroke, fill, x, y, c, tx); + } else if (figname == "Poly") { + glyph = new Polygon(brush, stroke, fill, x, y, c, tx); + } else if (figname == "Rect") { + glyph = new Rectangle( + brush, stroke, fill, x[0], y[0], x[1], y[1], tx + ); + } else if (figname == "Circ") { + Coord radius; + read(radius); + glyph = new Circle( + brush, stroke, fill, x[0], y[0], radius, tx + ); + } else if (figname == "Elli") { + Coord r1, r2; + read(r1); + read(r2); + glyph = new Ellipse( + brush, stroke, fill, x[0], y[0], r1, r2, tx + ); + } else { + glyph = nil; + } + Resource::unref(brush); + Resource::unref(stroke); + Resource::unref(fill); + + delete x; + delete y; + } + if (b != no_brush) { + Resource::unref(b); + } + Resource::unref(fg); + Resource::unref(bg); + Resource::unref(f); + if (s != no_stipple) { + Resource::unref(s); + } + Resource::unref(tx); + + for (int extra = fig->skip; extra > 0; --extra) { + skip(); + } + } + return glyph; +} + +boolean IdrawReaderImpl::fill() { + if (cur_ >= end_) { + int n = file_->read(start_); + if (n <= 0) { + return false; + } + cur_ = start_; + end_ = start_ + n; + } + return true; +} + +boolean IdrawReaderImpl::read(String& s) { + if (!fill()) { + return false; + } + const char* p1 = cur_; + while (p1 < end_ && isspace(*p1)) { + ++p1; + } + const char* p2 = p1; + while (p2 < end_ && !isspace(*p2)) { + ++p2; + } + cur_ = p2; + s = String(p1, p2 - p1); +} + +boolean IdrawReaderImpl::read(char& c) { + if (!fill()) { + return false; + } + c = *cur_++; + return true; +} + +boolean IdrawReaderImpl::read(int& i) { + String s; + return read(s) && s.convert(i); +} + +boolean IdrawReaderImpl::read(float& f) { + String s; + return read(s) && s.convert(f); +} + +void IdrawReaderImpl::skip() { + String s; + while (read(s) && s != "%I") { } +} + +const Brush* IdrawReaderImpl::read_brush() { + skip(); + String s; + read(s); + read(s); + if (s == "u") { + return nil; + } + if (s == "n") { + return no_brush; + } + int pattern; + int width; + s.convert(pattern); + read(width); + + for (ListItr(BrushInfoList) i(brushes_); i.more(); i.next()) { + BrushInfo& br = i.cur_ref(); + if (br.width_ == width && br.pattern_ == pattern) { + return br.brush_; + } + } + BrushInfo* b = new BrushInfo; + b->brush_ = new Brush(pattern, Coord(width)); + Resource::ref(b->brush_); + b->width_ = width; + b->pattern_ = pattern; + brushes_.append(*b); + delete b; + return b->brush_; +} + +const Color* IdrawReaderImpl::read_color() { + skip(); + String s; + read(s); + read(s); + if (s == "u") { + return nil; + } + float r, g, b; + read(r); + read(g); + read(b); + return new Color(r, g, b, 1.0); +} + +const Color* IdrawReaderImpl::dither_color( + const Color* f, const Color* b, float dither +) { + float fr, fg, fb; + float br, bg, bb; + f->intensities(fr, fg, fb); + b->intensities(br, bg, bb); + float red = (1 - dither) * fr + dither * br; + float green = (1 - dither) * fg + dither * bg; + float blue = (1 - dither) * fb + dither * bb; + return new Color(red, green, blue); +} + +const Font* IdrawReaderImpl::read_font() { + skip(); + String s; + read(s); + read(s); + if (s == "u") { + return nil; + } + String psname; + read(psname); + NullTerminatedString psname_nt(psname); + float pointsize; + read(pointsize); + if (PSFont::exists(psname_nt.string())) { + NullTerminatedString s_nt(s); + return new PSFont(psname_nt.string(), pointsize, s_nt.string(), 1.0) +; + } + return WidgetKit::instance()->font(); +} + +const Stipple* IdrawReaderImpl::read_stipple() { + skip(); + String s; + read(s); + read(s); + if (s == "u") { + return nil; + } + if (s == "n") { + return no_stipple; + } + float dither; + s.convert(dither); + for (ListItr(StippleList) i(stipples_); i.more(); i.next()) { + const Stipple* st = i.cur(); + if (st->dither_ == dither) { + return st; + } + } + Stipple* st = new Stipple(dither); + Resource::ref(st); + stipples_.append(st); + return st; +} + +Transformer* IdrawReaderImpl::read_transformer() { + skip(); + String s; + read(s); + read(s); + if (s != "u") { + float a[6]; + for (int i = 0; i < 6; i++) { + read(a[i]); + } + return new Transformer(a[0], a[1], a[2], a[3], a[4], a[5]); + } + return nil; +} diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/idraw.h iv-3.1-g++2.7.2/iv/src/examples/edraw/idraw.h --- iv-3.1/iv/src/examples/edraw/idraw.h Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/idraw.h Tue Apr 2 13:52:35 1996 @@ -0,0 +1,16 @@ +#ifndef idraw_h +#define idraw_h + +#include +#include + +class InputFile; +class Graphic; + +class IdrawReader { +public: + static Graphic* load(InputFile*); + static Graphic* load(const char*); +}; + +#endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/main.c iv-3.1-g++2.7.2/iv/src/examples/edraw/main.c --- iv-3.1/iv/src/examples/edraw/main.c Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/main.c Tue Apr 2 13:52:35 1996 @@ -0,0 +1,26 @@ +#include "glypheditor.h" +#include +#include +#include +#include + +static PropertyData props[] = { + { "*GlyphEditor*name", "Elastic Drawing editor" }, + { "*GlyphEditor*iconName", "EDraw" }, + { nil } +}; + +static OptionDesc options[] = { + { nil } +}; + +int main(int argc, char** argv) { + Session* session = new Session("Glypher", argc, argv, options, props); + GlyphEditor* ged = new GlyphEditor; + ApplicationWindow* w = new ApplicationWindow(ged); + Style* s = new Style(session->style()); + s->attribute("name", "Elastic Drawing Editor"); + s->attribute("iconName", "EDraw"); + w->style(s); + return session->run_window(w); +} diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/pacekeeper.c iv-3.1-g++2.7.2/iv/src/examples/edraw/pacekeeper.c --- iv-3.1/iv/src/examples/edraw/pacekeeper.c Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/pacekeeper.c Tue Apr 2 13:52:35 1996 @@ -0,0 +1,1043 @@ +#include "pacekeeper.h" +#include "pacemaker.h" +#include "pacer.h" +#include +#include +#include + +static Sec MaxTransit = 30000; +static SessionID globalID = 0; + +typedef unsigned int ImplState; + +static const unsigned int TOL = 0; +static const unsigned int MIN_CYCLE = 2; +static const unsigned int MAX_CYCLE = 10; +static const unsigned int USEC_TO_CYCLE = 10000; + +static long find_player(Scheduler* s, SchedulerList* plist) { + for (long i = 0; i < plist->count(); i++) { + if (s == plist->item(i)) { + return i; + } + } + return -1; +} + +class CCell { +public: + CCell(); +public: + float _coherence; + + USec _cpf; + USec _tleft; + USec _tdelta; +}; + +CCell::CCell () { + _coherence = 1.0; + _cpf = 0; + _tleft = 0; + _tdelta = 0; +} + +declareList(CCellList, CCell); +implementList(CCellList, CCell); + +declarePtrList(PlayList, CCellList); +implementPtrList(PlayList, CCellList); + +/********************************************************************/ +PaceKeeper::PaceKeeper () {} + +PaceKeeper::~PaceKeeper () {} + +void PaceKeeper::eval (Sec, USec) {} +void PaceKeeper::adjust (Scheduler*) {} + +/********************************************************************/ +class ContinueImpl { +public: + ContinueImpl(Pacer* root); + virtual ~ContinueImpl(); + + virtual void startall(Sec, USec); + virtual void stopall(Sec, USec); + + virtual void start(Scheduler*, Sec, USec); + virtual void play(Scheduler*, Sec, USec); + virtual void stop(Scheduler*, Sec, USec); +public: + Pacer* _root; + Grade _low, _high; + SchedulerList* _playerlist; + boolean _running; +}; + +ContinueImpl::ContinueImpl (Pacer* root) { + _root = root; + _playerlist = nil; + _running = false; +} + +ContinueImpl::~ContinueImpl () { + delete _playerlist; +} + +void ContinueImpl::startall (Sec sec, USec usec) { + globalID++; + _running = true; + if (_playerlist == nil) { + _playerlist = new SchedulerList(5); + _root->pick(*_playerlist); + _root->get_grades(_low, _high); + } + for (long k = 0; k < _playerlist->count(); k++) { + Scheduler* player = _playerlist->item(k); + player->start(sec, usec); + play(player, sec, usec); + } +} + +void ContinueImpl::stopall (Sec sec, USec usec) { + _running = false; + if (_playerlist != nil) { + for (long k = 0; k < _playerlist->count(); k++) { + Scheduler* player = _playerlist->item(k); + player->stop(sec, usec); + } + } +} + +void ContinueImpl::start (Scheduler* p, Sec sec, USec usec) { + if (!_running) { + _running = true; + globalID++; + } + + p->start(sec, usec); + play(p, sec, usec); +} + +void ContinueImpl::stop (Scheduler* p, Sec sec, USec usec) { + p->stop(sec, usec); +} + +void ContinueImpl::play (Scheduler* s, Sec sec, USec usec) { + RunTime rtime; + + rtime._cur_grade = _low; + rtime._fut_grade = _low; + rtime._id = globalID; + + USec period = s->get_period(); + + rtime._period = period; + rtime._sec = sec; + rtime._usec = usec; + + s->play(rtime); +} + +/********************************************************************/ +Continuator::Continuator (Pacer* root) { + _impl = new ContinueImpl(root); +} + +Continuator::~Continuator () { + delete _impl; +} + +void Continuator::startall (Sec sec, USec usec) { + _impl->startall(sec, usec); +} + +void Continuator::stopall (Sec sec, USec usec) { + _impl->stopall(sec, usec); +} + +void Continuator::start (Scheduler* s, Sec sec, USec usec) { + _impl->start(s, sec, usec); +} + +void Continuator::play (Scheduler* s, Sec sec, USec usec) { + _impl->play(s, sec, usec); +} + +void Continuator::stop (Scheduler* s, Sec sec, USec usec) { + _impl->stop(s, sec, usec); +} + +/*******************************************************************/ +class EventImpl { +public: + enum {sustain, transit, trial}; + + EventImpl(Pacer* r); + virtual ~EventImpl(); + + virtual void startall(Sec, USec); + virtual void stopall(Sec, USec); + + virtual void start(Scheduler*, Sec, USec); + virtual void play(Scheduler*, Sec, USec); + virtual void stop(Scheduler*, Sec, USec); + virtual void eval(Sec, USec); + virtual void adjust(Scheduler*); +protected: + Pacer* _root; + SchedulerList* _playerlist; + PlayList* _playlist; + + ImplState _fut_state; + ImplState _cur_state; + + Grade _cur_grade; + Grade _fut_grade; + Grade _low, _high; + + boolean _running; +}; + +EventImpl::EventImpl (Pacer* r) { + _root = r; + _running = false; + _playerlist = nil; + _playlist = nil; +} + +EventImpl::~EventImpl () { + delete _playerlist; + if (_playlist != nil) { + for (long i = 0; i < _playlist->count(); i++) { + delete _playlist->item(i); + } + delete _playlist; + } +} + +void EventImpl::stopall (Sec sec, USec usec) { + _running = false; + if (_playerlist != nil) { + for (long k = 0; k < _playerlist->count(); k++) { + Scheduler* player = _playerlist->item(k); + player->stop(sec, usec); + } + } +} + +void EventImpl::startall (Sec sec, USec usec) { + _running = true; + globalID++; + + if (_playerlist == nil) { + _playerlist = new SchedulerList(5); + _root->get_grades(_low, _high); + _root->pick(*_playerlist); + + long grades = _high - _low + 1; + + CCell cell; + + _playlist = new PlayList(_playerlist->count()); + for (long i = 0; i < _playerlist->count(); i++) { + CCellList* clist = new CCellList(grades); + _playlist->append(clist); + for (long j = 0; j < grades; j++) { + clist->append(cell); + } + } + } + _cur_grade = _low; + _fut_grade = _low; + _cur_state = sustain; + _fut_state = sustain; + + RunTime rtime; + + rtime._cur_grade = _cur_grade; + rtime._fut_grade = _fut_grade; + rtime._id = globalID; + rtime._sec = sec; + rtime._usec = usec; + + for (long k = 0; k < _playerlist->count(); k++) { + Scheduler* player = _playerlist->item(k); + player->start(sec, usec); + + USec period = player->get_period(); + rtime._period = period; + + player->play(rtime); + } +} + +void EventImpl::play (Scheduler* p, Sec sec, USec usec) { + RunTime rtime; + + rtime._cur_grade = _cur_grade; + rtime._fut_grade = _fut_grade; + rtime._id = globalID; + + USec period = p->get_period(); + + rtime._period = period; + rtime._sec = sec; + rtime._usec = usec; + + timeval b, a; + gettimeofday(&b, nil); + + p->play(rtime); + + gettimeofday(&a, nil); + USec len = (a.tv_usec-b.tv_usec)+(a.tv_sec-b.tv_sec)*1e6; + + long index = find_player(p, _playerlist); + + if (index >= 0) { + CCell& cc = _playlist->item(index)->item_ref(_fut_grade); + USec cpf = len; + + boolean to_eval = false; + if (cc._cpf > 0) { + cc._tdelta += cpf - cc._cpf; + } else { + to_eval = true; + } + cc._cpf = cpf; + cc._tleft += rtime._period-len; + if (to_eval && cc._tleft < 0) { + _cur_state = _fut_state; + _fut_state = sustain; + eval(a.tv_sec, a.tv_usec); + } + } +} + +void EventImpl::eval (Sec, USec) { + if (!_running) { + return; + } + switch(_fut_state) { + case trial: + { + _cur_state = _fut_state; + + /* See if need to downgrade */ + if (_fut_grade < _high) { + for (long i = 0; i < _playlist->count(); i++) { + CCell& cc = _playlist->item(i)->item_ref(_fut_grade); + + if (cc._tleft < 0) { + for (long j = 0; j < _playlist->count(); j++) { + CCell& cell0 = _playlist->item(j)->item_ref( + _fut_grade + ); + cell0._tleft = 0; + cell0._tdelta = 0; + + CCell& cell1 = _playlist->item(j)->item_ref( + _fut_grade+1 + ); + cell1._tleft = 0; + cell1._tdelta = 0; + cell1._cpf = 0; + } + _fut_state = transit; + break; + } + } + } + if (_fut_state != transit) { + _fut_state = sustain; + _cur_grade = _fut_grade; + } else { + _cur_grade = _fut_grade; + _fut_grade += 1; + } + } + break; + case transit: + { + if (_cur_state == sustain) { + _cur_grade = _fut_grade; + _cur_state = _fut_state; + if (_fut_grade > _cur_grade) { + _fut_state = sustain; + } else { + _fut_state = trial; + } + } else { + _cur_grade = _fut_grade; + _cur_state = _fut_state; + _fut_state = sustain; + } + } + break; + case sustain: + { + _cur_state = _fut_state; + _cur_grade = _fut_grade; + + /* See if need to downgrade */ + + if (_fut_grade < _high) { + for (long i = 0; i < _playlist->count(); i++) { + CCell& cc = _playlist->item(i)->item_ref(_cur_grade); + + if (cc._tleft < 0) { + for (long j = 0; j < _playlist->count(); j++) { + CCell& cell0 = _playlist->item(j)->item_ref( + _cur_grade + ); + cell0._tleft = 0; + cell0._tdelta = 0; + + CCell& cell1 = _playlist->item(j)->item_ref( + _cur_grade+1 + ); + cell1._tleft = 0; + cell1._tdelta = 0; + cell1._cpf = 0; + } + _fut_state = transit; + _fut_grade = _cur_grade+1; + PaceMaker::instance()->cont_eval( + MaxTransit + SAMPLE_PERIOD + ); + return; + } + } + } + } + break; + } + if (_fut_state == transit) { + PaceMaker::instance()->cont_eval(MaxTransit + SAMPLE_PERIOD); + } else { + PaceMaker::instance()->cont_eval(SAMPLE_PERIOD); + } +} + +void EventImpl::start (Scheduler* p, Sec sec, USec usec) { + if (!_running) { + _running = true; + globalID++; + } + + long index = find_player(p, _playerlist); + if (index >= 0) { + CCell cell; + CCellList* clist = _playlist->item(index); + for (long i = 0; i < clist->count(); i++) { + clist->item_ref(i) = cell; + } + } + p->start(sec, usec); + play(p, sec, usec); +} + +void EventImpl::stop (Scheduler* p, Sec sec, USec usec) { + long index = find_player(p, _playerlist); + if (index >= 0) { + CCell cell; + CCellList* clist = _playlist->item(index); + for (long i = 0; i < clist->count(); i++) { + clist->item_ref(i) = cell; + } + } + p->stop(sec, usec); +} + +void EventImpl::adjust (Scheduler* p) { + if (_playerlist == nil) { + return; + } + USec period = p->get_period(); + long index = find_player(p, _playerlist); + if (index < 0) { + return; + } + CCellList* clist = _playlist->item(index); + Grade level = clist->count()-1; + + for (long i = 0; i < clist->count(); i++) { + if (clist->item_ref(i)._cpf < period) { + level = i; + break; + } + } + if (level < _fut_grade) { + level = _fut_grade - 1; + //printf("attempted by EventKeeper\n"); + } + if (level != _fut_grade) { + _cur_state = _fut_state; + _fut_state = transit; + _cur_grade = _fut_grade; + _fut_grade = level; + + for (long j = 0; j < _playlist->count(); j++) { + CCell& cell0 = _playlist->item(j)->item_ref( + _cur_grade + ); + cell0._tleft = 0; + cell0._tdelta = 0; + + CCell& cell1 = _playlist->item(j)->item_ref( + _fut_grade + ); + cell1._tleft = 0; + cell1._tdelta = 0; + if (_fut_grade < _cur_grade) { + cell0._cpf = 0; + cell1._cpf = 0; + } else { + cell1._cpf = 0; + } + } + PaceMaker::instance()->cont_eval(MaxTransit+SAMPLE_PERIOD); + } +} + +/*******************************************************************/ +EventKeeper::EventKeeper (Pacer* root) { + _impl = new EventImpl(root); +} + +EventKeeper::~EventKeeper () { + delete _impl; +} + +void EventKeeper::adjust (Scheduler* s) { + _impl->adjust(s); +} + +void EventKeeper::eval (Sec sec, USec usec) { + _impl->eval(sec, usec); +} + +void EventKeeper::startall (Sec sec, USec usec) { + _impl->startall(sec, usec); +} + +void EventKeeper::stopall (Sec sec, USec usec) { + _impl->stopall(sec, usec); +} + +void EventKeeper::start (Scheduler* s, Sec sec, USec usec) { + _impl->start(s, sec, usec); +} + +void EventKeeper::play (Scheduler* s, Sec sec, USec usec) { + _impl->play(s, sec, usec); +} + +void EventKeeper::stop (Scheduler* s, Sec sec, USec usec) { + _impl->stop(s, sec, usec); +} + +/*******************************************************************/ +class Cycle { +public: + Cycle(); +public: + unsigned long _cycle; + unsigned long _cur_cycle; +}; + +Cycle::Cycle () { + _cycle = MIN_CYCLE; + _cur_cycle = 0; +} + +declareList (CycleList, Cycle); +implementList (CycleList, Cycle); + +class DampedImpl : public EventImpl { +public: + DampedImpl(Pacer* r); + virtual ~DampedImpl(); + + virtual void startall(Sec, USec); + virtual void eval(Sec, USec); + virtual void adjust(Scheduler*); +protected: + CycleList* _cyclelist; +}; + +DampedImpl::DampedImpl (Pacer* r) : EventImpl (r) { + _cyclelist = nil; +} + +DampedImpl::~DampedImpl () { + delete _cyclelist; +} + +void DampedImpl::startall (Sec sec, USec usec) { + EventImpl::startall(sec, usec); + if (_cyclelist == nil) { + Grade grades = _high-_low+1; + _cyclelist = new CycleList(grades); + Cycle cycle; + for (long i = 0; i < grades; i++) { + _cyclelist->append(cycle); + } + } +} + +void DampedImpl::eval (Sec sec, USec usec) { + if (!_running) { + return; + } + switch(_fut_state) { + case trial: + { + _cur_state = _fut_state; + + /* See if need to downgrade */ + if (_fut_grade < _high) { + for (long i = 0; i < _playlist->count(); i++) { + CCell& cc = _playlist->item(i)->item_ref(_fut_grade); + + if (cc._tleft < 0) { + for (long j = 0; j < _playlist->count(); j++) { + CCell& cell0 = _playlist->item(j)->item_ref( + _fut_grade + ); + cell0._tleft = 0; + cell0._tdelta = 0; + + CCell& cell1 = _playlist->item(j)->item_ref( + _fut_grade+1 + ); + cell1._tleft = 0; + cell1._tdelta = 0; + cell1._cpf = 0; + + } + _fut_state = transit; + + break; + } + } + } + if (_fut_state != transit) { + //printf("succeeded\n"); + + _fut_state = sustain; + _cur_grade = _fut_grade; + Cycle& cycle = _cyclelist->item_ref(_fut_grade); + cycle._cur_cycle = 0; + + if (_fut_grade < _high) { + Cycle& past_cycle = _cyclelist->item_ref(_fut_grade+1); + if (past_cycle._cycle > MIN_CYCLE) { + past_cycle._cycle--; + } + past_cycle._cur_cycle = 0; + } + } else { + //printf("failed\n"); + _cur_grade = _fut_grade; + _fut_grade += 1; + Cycle& cycle = _cyclelist->item_ref(_fut_grade); + + if (cycle._cycle < MAX_CYCLE) { + cycle._cycle++; + } + cycle._cur_cycle = 0; + } + } + break; + case transit: + { + EventImpl::eval(sec, usec); + return; + } + break; + case sustain: + { + EventImpl::eval(sec, usec); + if (_fut_state == sustain) { + /* See if need to upgrade */ + + if (_cur_grade > _low) { + Cycle& cycle = _cyclelist->item_ref(_fut_grade); + cycle._cur_cycle++; + if (cycle._cur_cycle > cycle._cycle) { + cycle._cur_cycle = 0; + + for (long j = 0; j < _playlist->count(); j++) { + CCell& cell0 = _playlist->item(j)->item_ref( + _cur_grade + ); + cell0._tleft = 0; + cell0._tdelta = 0; + + CCell& cell1 = _playlist->item(j)->item_ref( + _cur_grade-1 + ); + cell1._tleft = 0; + cell1._tdelta = 0; + } + //printf("attempted by Damped_Osc/PCKeeper\n"); + _fut_state = transit; + _fut_grade = _cur_grade-1; + } + } + } else { + return; + } + } + break; + } + if (_fut_state == transit) { + PaceMaker::instance()->cont_eval(MaxTransit + SAMPLE_PERIOD); + } else { + PaceMaker::instance()->cont_eval(SAMPLE_PERIOD); + } +} + +void DampedImpl::adjust (Scheduler* p) { + EventImpl::adjust(p); + if (_fut_state == transit) { + Cycle& cycle0 = _cyclelist->item_ref(_cur_grade); + cycle0._cur_cycle = 0; + Cycle& cycle1 = _cyclelist->item_ref(_fut_grade); + cycle1._cur_cycle = 0; + } +} + +/*******************************************************************/ +DampedKeeper::DampedKeeper (Pacer* root) { + _impl = new DampedImpl(root); +} + +DampedKeeper::~DampedKeeper () { + delete _impl; +} + +void DampedKeeper::adjust (Scheduler* s) { + _impl->adjust(s); +} + +void DampedKeeper::eval (Sec sec, USec usec) { + _impl->eval(sec, usec); +} + +void DampedKeeper::startall (Sec sec, USec usec) { + _impl->startall(sec, usec); +} + +void DampedKeeper::stopall (Sec sec, USec usec) { + _impl->stopall(sec, usec); +} + +void DampedKeeper::start (Scheduler* s, Sec sec, USec usec) { + _impl->start(s, sec, usec); +} + +void DampedKeeper::play (Scheduler* s, Sec sec, USec usec) { + _impl->play(s, sec, usec); +} + +void DampedKeeper::stop (Scheduler* s, Sec sec, USec usec) { + _impl->stop(s, sec, usec); +} + +/*******************************************************************/ +class PCImpl : public DampedImpl { +public: + PCImpl(Pacer*); + virtual ~PCImpl(); + + virtual void eval(Sec, USec); +}; + +PCImpl::PCImpl (Pacer* p) : DampedImpl (p) {} + +PCImpl::~PCImpl () {} + +void PCImpl::eval (Sec sec, USec usec) { + if (!_running) { + return; + } + if (_fut_state == trial) { + _cur_state = _fut_state; + + USec credit = 0; + USec penalty = 0; + + /* See if need to downgrade */ + if (_fut_grade < _high) { + for (long i = 0; i < _playlist->count(); i++) { + CCell& cc = _playlist->item(i)->item_ref(_fut_grade); + + if (cc._tleft < 0) { + penalty = -cc._tleft; + for (long j = 0; j < _playlist->count(); j++) { + CCell& cell0 = _playlist->item(j)->item_ref( + _fut_grade + ); + cell0._tleft = 0; + cell0._tdelta = 0; + + CCell& cell1 = _playlist->item(j)->item_ref( + _fut_grade+1 + ); + cell1._tleft = 0; + cell1._tdelta = 0; + cell1._cpf = 0; + + } + _fut_state = transit; + break; + } else { + credit += cc._tleft; + } + } + } + if (_fut_state != transit) { + //printf("succeeded\n"); + _fut_state = sustain; + _cur_grade = _fut_grade; + Cycle& cycle = _cyclelist->item_ref(_fut_grade); + cycle._cur_cycle = 0; + + if (_fut_grade < _high) { + Cycle& past_cycle = _cyclelist->item_ref(_fut_grade+1); + if (past_cycle._cycle > MIN_CYCLE) { + past_cycle._cycle -= credit/USEC_TO_CYCLE; + } + past_cycle._cur_cycle = 0; + } + + PaceMaker::instance()->cont_eval(SAMPLE_PERIOD); + } else { + //printf("failed\n"); + _cur_grade = _fut_grade; + _fut_grade += 1; + Cycle& cycle = _cyclelist->item_ref(_fut_grade); + + if (cycle._cycle < MAX_CYCLE) { + cycle._cycle += penalty/USEC_TO_CYCLE; + } + cycle._cur_cycle = 0; + + PaceMaker::instance()->cont_eval(MaxTransit + SAMPLE_PERIOD); + } + } else { + DampedImpl::eval(sec, usec); + } +} + +/*******************************************************************/ +PCKeeper::PCKeeper (Pacer* root) { + _impl = new PCImpl(root); +} + +PCKeeper::~PCKeeper () { + delete _impl; +} + +void PCKeeper::adjust (Scheduler* s) { + _impl->adjust(s); +} + +void PCKeeper::eval (Sec sec, USec usec) { + _impl->eval(sec, usec); +} + +void PCKeeper::startall (Sec sec, USec usec) { + _impl->startall(sec, usec); +} + +void PCKeeper::stopall (Sec sec, USec usec) { + _impl->stopall(sec, usec); +} + +void PCKeeper::start (Scheduler* s, Sec sec, USec usec) { + _impl->start(s, sec, usec); +} + +void PCKeeper::play (Scheduler* s, Sec sec, USec usec) { + _impl->play(s, sec, usec); +} + +void PCKeeper::stop (Scheduler* s, Sec sec, USec usec) { + _impl->stop(s, sec, usec); +} + +/*******************************************************************/ +class CoherenceImpl : public EventImpl { +public: + CoherenceImpl(Pacer* r); + virtual ~CoherenceImpl(); + + void eval(Sec, USec); +}; + +CoherenceImpl::CoherenceImpl (Pacer* r) : EventImpl (r) {} + +CoherenceImpl::~CoherenceImpl () {} + +void CoherenceImpl::eval (Sec sec, USec usec) { + if (!_running) { + return; + } + switch(_fut_state) { + case trial: + { + _cur_state = _fut_state; + + /* See if need to downgrade */ + if (_fut_grade < _high) { + for (long i = 0; i < _playlist->count(); i++) { + CCell& cc = _playlist->item(i)->item_ref(_fut_grade); + + if (cc._tleft < 0) { + for (long j = 0; j < _playlist->count(); j++) { + CCell& cell0 = _playlist->item(j)->item_ref( + _fut_grade + ); + cell0._tleft = 0; + cell0._tdelta = 0; + + CCell& cell1 = _playlist->item(j)->item_ref( + _fut_grade+1 + ); + cell1._tleft = 0; + cell1._tdelta = 0; + cell1._cpf = 0; + + } + _fut_state = transit; + + CCell& acell = _playlist->item(i)->item_ref( + _fut_grade+1 + ); + acell._coherence /= 2; + break; + } else { + CCell& acell = _playlist->item(i)->item_ref( + _fut_grade+1 + ); + acell._coherence *= 1.2; + if (acell._coherence > 1.0) { + acell._coherence = 1.0; + } + } + } + } + if (_fut_state != transit) { + _fut_state = sustain; + _cur_grade = _fut_grade; + //printf("succeeded \n"); + } else { + _cur_grade = _fut_grade; + _fut_grade += 1; + //printf("failed \n"); + } + } + break; + case transit: + { + EventImpl::eval(sec, usec); + return; + } + break; + case sustain: + { + EventImpl::eval(sec, usec); + if (_fut_state == sustain) { + /* See if need to upgrade */ + + if (_cur_grade > _low) { + for (long i = 0; i < _playlist->count(); i++) { + USec period = _playerlist->item(i)->get_period(); + CCell& b = _playlist->item(i)->item_ref(_cur_grade); + CCell& a = _playlist->item(i)->item_ref(_cur_grade-1); + + if (b._tdelta > 0) { + PaceMaker::instance()->cont_eval(SAMPLE_PERIOD); + return; + } + float delta = b._tdelta; + float cpf1 = b._cpf-delta; + float cpf0 = a._cpf-a._tdelta; + + USec est = (USec) (cpf0 + cpf0/cpf1*delta*b._coherence); + if (est > (period-TOL)) { + PaceMaker::instance()->cont_eval(SAMPLE_PERIOD); + return; + } + } + //printf("attempted by CohKeeper\n"); + for (long j = 0; j < _playlist->count(); j++) { + CCell& cell0 = _playlist->item(j)->item_ref( + _cur_grade + ); + cell0._tleft = 0; + cell0._tdelta = 0; + + CCell& cell1 = _playlist->item(j)->item_ref( + _cur_grade-1 + ); + cell1._tleft = 0; + cell1._tdelta = 0; + } + _fut_state = transit; + _fut_grade = _cur_grade-1; + } + } else { + return; + } + } + break; + } + if (_fut_state == transit) { + PaceMaker::instance()->cont_eval(MaxTransit + SAMPLE_PERIOD); + } else { + PaceMaker::instance()->cont_eval(SAMPLE_PERIOD); + } +} + +/*******************************************************************/ +CoherenceKeeper::CoherenceKeeper (Pacer* r) { + _impl = new CoherenceImpl(r); +} + +CoherenceKeeper::~CoherenceKeeper () { + delete _impl; +} + +void CoherenceKeeper::startall (Sec sec, USec usec) { + _impl->startall(sec, usec); +} + +void CoherenceKeeper::stopall (Sec sec, USec usec) { + _impl->stopall(sec, usec); +} + +void CoherenceKeeper::play (Scheduler* p, Sec sec, USec usec) { + _impl->play(p, sec, usec); +} + +void CoherenceKeeper::start (Scheduler* p, Sec sec, USec usec) { + _impl->start(p, sec, usec); +} + +void CoherenceKeeper::stop (Scheduler* p, Sec sec, USec usec) { + _impl->stop(p, sec, usec); +} + +void CoherenceKeeper::eval (Sec sec, USec usec) { + _impl->eval(sec, usec); +} + +void CoherenceKeeper::adjust (Scheduler* p) { + _impl->adjust(p); +} diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/pacekeeper.h iv-3.1-g++2.7.2/iv/src/examples/edraw/pacekeeper.h --- iv-3.1/iv/src/examples/edraw/pacekeeper.h Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/pacekeeper.h Tue Apr 2 13:52:35 1996 @@ -0,0 +1,121 @@ +#ifndef pacekeeper_h +#define pacekeeper_h + +#include "globals.h" + +class Scheduler; +class ContinueImpl; +class CoherenceImpl; +class DampedImpl; +class EventImpl; +class PCImpl; + +class PaceKeeper { +public: + enum { + NoPK = 0, EDriven, DampedOsc, PC, Coh + }; + + virtual ~PaceKeeper(); + + virtual void startall(Sec, USec) = 0; + virtual void stopall(Sec, USec) = 0; + + virtual void start(Scheduler*, Sec, USec) = 0; + virtual void play(Scheduler*, Sec, USec) = 0; + virtual void stop(Scheduler*, Sec, USec) = 0; + + virtual void eval(Sec, USec); + virtual void adjust(Scheduler*); +protected: + PaceKeeper(); +}; + +class Continuator : public PaceKeeper { +public: + Continuator(Pacer* root); + virtual ~Continuator(); + + virtual void startall(Sec, USec); + virtual void stopall(Sec, USec); + + virtual void start(Scheduler*, Sec, USec); + virtual void play(Scheduler*, Sec, USec); + virtual void stop(Scheduler*, Sec, USec); + +protected: + ContinueImpl* _impl; +}; + +class EventKeeper : public PaceKeeper { +public: + EventKeeper(Pacer* root); + virtual ~EventKeeper(); + + virtual void startall(Sec, USec); + virtual void stopall(Sec, USec); + + virtual void start(Scheduler*, Sec, USec); + virtual void play(Scheduler*, Sec, USec); + virtual void stop(Scheduler*, Sec, USec); + + virtual void adjust(Scheduler*); + virtual void eval(Sec, USec); +protected: + EventImpl* _impl; +}; + +class DampedKeeper : public PaceKeeper { +public: + DampedKeeper(Pacer* root); + virtual ~DampedKeeper(); + + virtual void startall(Sec, USec); + virtual void stopall(Sec, USec); + + virtual void start(Scheduler*, Sec, USec); + virtual void play(Scheduler*, Sec, USec); + virtual void stop(Scheduler*, Sec, USec); + + virtual void adjust(Scheduler*); + virtual void eval(Sec, USec); +protected: + DampedImpl* _impl; +}; + +class PCKeeper : public PaceKeeper { +public: + PCKeeper(Pacer* root); + virtual ~PCKeeper(); + + virtual void startall(Sec, USec); + virtual void stopall(Sec, USec); + + virtual void start(Scheduler*, Sec, USec); + virtual void play(Scheduler*, Sec, USec); + virtual void stop(Scheduler*, Sec, USec); + + virtual void adjust(Scheduler*); + virtual void eval(Sec, USec); +protected: + PCImpl* _impl; +}; + +class CoherenceKeeper : public PaceKeeper { +public: + CoherenceKeeper(Pacer* root); + virtual ~CoherenceKeeper(); + + virtual void startall(Sec, USec); + virtual void stopall(Sec, USec); + + virtual void start(Scheduler*, Sec, USec); + virtual void play(Scheduler*, Sec, USec); + virtual void stop(Scheduler*, Sec, USec); + virtual void eval(Sec, USec); + virtual void adjust(Scheduler*); +private: + CoherenceImpl* _impl; +}; + +#endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/pacemaker.c iv-3.1-g++2.7.2/iv/src/examples/edraw/pacemaker.c --- iv-3.1/iv/src/examples/edraw/pacemaker.c Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/pacemaker.c Tue Apr 2 13:52:35 1996 @@ -0,0 +1,341 @@ +#include +#include +#include +#include +#include "pacekeeper.h" +#include "pacer.h" +#include "pacemaker.h" + +class PaceHandlerList; + +class PaceMakerImpl { +public: + PaceMakerImpl(PaceKeeper*, USec period); + virtual ~PaceMakerImpl(); + + void set_pacekeeper(PaceKeeper*); + PaceKeeper* get_pacekeeper(); + + void tick(long sec, long usec); + + void startall(); + void pause(); + void resume(); + + void play(Scheduler*, Sec, USec); + + void start(Scheduler*); + void cont(Scheduler*, USec); + void stop(Scheduler*); + void stopall(); + + void cont_eval(USec period); + void get_origin(Sec& sec, USec& usec); + +public: + PaceHandlerList* _plist; + IOHandler* _ehandler; + PaceKeeper* _pacekeeper; + boolean _running; + boolean _paused; + + Sec _o_sec; + USec _o_usec; + + Sec _p_sec; + USec _p_usec; + USec _period; +}; + +class PaceHandler : public IOHandler { +public: + PaceHandler(Scheduler* = nil, PaceMakerImpl* = nil); + virtual ~PaceHandler(); + + virtual void timerExpired(long, long); +public: + Scheduler* _pacer; + PaceMakerImpl* _impl; +}; + +PaceHandler::PaceHandler(Scheduler* p, PaceMakerImpl* impl) { + _pacer = p; + _impl = impl; +} + +PaceHandler::~PaceHandler () {} + +void PaceHandler::timerExpired (long sec, long usec) { + _impl->play(_pacer, sec, usec); +} + +declarePtrList(PaceHandlerList, PaceHandler); +implementPtrList(PaceHandlerList, PaceHandler); + +class EvalHandler : public IOHandler { +public: + EvalHandler(PaceMakerImpl*); + virtual void timerExpired(long, long); +public: + PaceMakerImpl* _impl; +}; + +EvalHandler::EvalHandler (PaceMakerImpl* impl) { + _impl = impl; +} + +void EvalHandler::timerExpired(long sec, long usec) { + _impl->tick(sec, usec); +} + +PaceMakerImpl::PaceMakerImpl (PaceKeeper* pk, USec period) { + _running = false; + _paused = false; + _period = period; + _pacekeeper = pk; + + _o_sec = 0; + _o_usec = 0; + _p_sec = 0; + _p_usec = 0; + + _plist = new PaceHandlerList(5); + _ehandler = new EvalHandler(this); +} + +PaceMakerImpl::~PaceMakerImpl () { + Dispatcher& d = Dispatcher::instance(); + for (long i = 0; i < _plist->count(); i++) { + d.stopTimer(_plist->item(i)); + delete _plist->item(i); + } + d.stopTimer(_ehandler); + delete _ehandler; + delete _plist; +} + +void PaceMakerImpl::set_pacekeeper(PaceKeeper* pacekeeper) { + _pacekeeper = pacekeeper; +} + +PaceKeeper* PaceMakerImpl::get_pacekeeper () { + return _pacekeeper; +} + +void PaceMakerImpl::tick (long sec, long usec) { + _pacekeeper->eval(sec-_o_sec, usec-_o_sec); +} + +void PaceMakerImpl::cont_eval (USec period) { + if (period > 0) { + _period = period; + } + Dispatcher& d = Dispatcher::instance(); + d.stopTimer(_ehandler); + d.startTimer(0, _period, _ehandler); + +} + +void PaceMakerImpl::get_origin(Sec& sec, USec& usec) { + sec = _o_sec; + usec = _o_usec; +} + +void PaceMakerImpl::startall () { + _running = true; + + timeval curTime; + gettimeofday(&curTime, nil); + + _o_sec = curTime.tv_sec; + _o_usec = curTime.tv_usec; + + _pacekeeper->startall(0, 0); + + Dispatcher& d = Dispatcher::instance(); + d.startTimer(0, _period, _ehandler); +} + +void PaceMakerImpl::pause () { + if (_running && !_paused) { + _paused = true; + + timeval curTime; + + gettimeofday(&curTime, nil); + _p_sec = curTime.tv_sec; + _p_usec = curTime.tv_usec; + + Dispatcher& d = Dispatcher::instance(); + for (long i = 0; i < _plist->count(); i++) { + d.stopTimer(_plist->item(i)); + } + d.stopTimer(_ehandler); + } +} + +void PaceMakerImpl::resume () { + if (_running && _paused) { + timeval curTime; + gettimeofday(&curTime, nil); + Sec sec = _p_sec - _o_sec; + Sec usec = _p_usec - _o_usec; + + for (long i = 0; i < _plist->count(); i++) { + _pacekeeper->play(_plist->item(i)->_pacer, sec, usec); + } + + _o_sec += curTime.tv_sec - _p_sec; + _o_usec += curTime.tv_usec - _p_usec; + Dispatcher& d = Dispatcher::instance(); + d.startTimer(0, _period, _ehandler); + } +} + +void PaceMakerImpl::play (Scheduler* p, Sec sec, USec usec) { + if (_running && !_paused) { + for (long i = 0; i < _plist->count(); i++) { + if (_plist->item(i)->_pacer == p) { + Dispatcher& d = Dispatcher::instance(); + d.stopTimer(_plist->item(i)); + delete _plist->item(i); + _plist->remove(i); + break; + } + } + _pacekeeper->play(p, sec-_o_sec, usec-_o_usec); + } +} + +void PaceMakerImpl::cont (Scheduler* p, USec usec) { + if (_running) { + if (usec > 0) { + PaceHandler* phandler = new PaceHandler(p, this); + _plist->append(phandler); + Dispatcher::instance().startTimer(0, usec, phandler); + } else { + timeval curTime; + gettimeofday(&curTime, nil); + + play(p, curTime.tv_sec, curTime.tv_usec); + } + } +} + +void PaceMakerImpl::start (Scheduler* p) { + timeval curTime; + + gettimeofday(&curTime, nil); + if (!_running) { + _running = true; + _o_sec = curTime.tv_sec; + _o_usec = curTime.tv_usec; + + _pacekeeper->start(p, 0, 0); + } else { + _pacekeeper->start(p, curTime.tv_sec-_o_sec, curTime.tv_usec-_o_usec); + } + +} + +void PaceMakerImpl::stop (Scheduler* p) { + for (long i = 0; i < _plist->count(); i++) { + if (_plist->item(i)->_pacer == p) { + Dispatcher::instance().stopTimer(_plist->item(i)); + delete _plist->item(i); + _plist->remove(i); + break; + } + } + timeval curTime; + + gettimeofday(&curTime, nil); + _pacekeeper->stop(p, curTime.tv_sec-_o_sec, curTime.tv_usec-_o_usec); +} + +void PaceMakerImpl::stopall () { + Dispatcher& d = Dispatcher::instance(); + if (_running) { + _running = false; + for (long i = 0; i < _plist->count(); i++) { + d.stopTimer(_plist->item(i)); + delete _plist->item(i); + } + } + _plist->remove_all(); + d.stopTimer(_ehandler); + if (_pacekeeper != nil) { + timeval curTime; + + gettimeofday(&curTime, nil); + _pacekeeper->stopall(curTime.tv_sec-_o_sec, curTime.tv_usec-_o_usec); + } +} + +/*************************************************************************/ +static PaceMaker* _maker = nil; + +PaceMaker::PaceMaker (PaceKeeper* pk, USec period) { + _impl = new PaceMakerImpl(pk, period); + _maker = this; +} + +PaceMaker::~PaceMaker () { + delete _impl; + if (_maker == this) { + _maker = nil; + } +} + +void PaceMaker::startall () { + _impl->startall(); +} + +void PaceMaker::pause () { + _impl->pause(); +} + +void PaceMaker::resume () { + _impl->resume(); +} + +void PaceMaker::cont (Scheduler* p, USec usec) { + _impl->cont(p, usec); +} + +void PaceMaker::start (Scheduler* p) { + _impl->start(p); +} + +void PaceMaker::stop (Scheduler* p) { + _impl->stop(p); +} + +void PaceMaker::stopall () { + _impl->stopall(); +} + +PaceMaker* PaceMaker::instance () { + if (_maker == nil) { + _maker = new PaceMaker; + } + return _maker; +} + +void PaceMaker::set_pacekeeper(PaceKeeper* pacekeeper) { + _impl->set_pacekeeper(pacekeeper); +} + +PaceKeeper* PaceMaker::get_pacekeeper () { return _impl->get_pacekeeper(); } + +void PaceMaker::cont_eval(USec period) { + _impl->cont_eval(period); +} + +void PaceMaker::get_origin (Sec& sec, USec& usec) { + Sec s; + USec u; + _impl->get_origin(s, u); + sec = s; + usec = u; +} diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/pacemaker.h iv-3.1-g++2.7.2/iv/src/examples/edraw/pacemaker.h --- iv-3.1/iv/src/examples/edraw/pacemaker.h Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/pacemaker.h Tue Apr 2 13:52:35 1996 @@ -0,0 +1,37 @@ +#ifndef pacemaker_h +#define pacemaker_h + +#include "globals.h" + +class PaceMakerImpl; +class PaceKeeper; +class Pacer; + +const USec SAMPLE_PERIOD = 500000; + +class PaceMaker { +public: + PaceMaker(PaceKeeper* = nil, USec period = SAMPLE_PERIOD); + virtual ~PaceMaker(); + + virtual void startall(); + virtual void pause(); + virtual void resume(); + + virtual void start(Scheduler*); + virtual void cont(Scheduler*, USec); + virtual void stop(Scheduler*); + virtual void stopall(); + + virtual void cont_eval(USec period = -1); + virtual void get_origin(Sec&, USec&); + + static PaceMaker* instance(); + + virtual void set_pacekeeper(PaceKeeper*); + virtual PaceKeeper* get_pacekeeper(); +protected: + PaceMakerImpl* _impl; +}; + +#endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/pacer.c iv-3.1-g++2.7.2/iv/src/examples/edraw/pacer.c --- iv-3.1/iv/src/examples/edraw/pacer.c Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/pacer.c Tue Apr 2 13:52:35 1996 @@ -0,0 +1,980 @@ +#include "figure.h" +#include "pacer.h" +#include "pacemaker.h" +#include "pacekeeper.h" +#include "gcollector.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +static Coord Area(Coord l, Coord b, Coord r, Coord t) { + return (r-l)*(t-b); +} + +static boolean damaged (BoxObj& box) { + return !( + box._l == 0 && box._b == 0 && box._r == 0 && box._t == 0 + ); +} + +static void clear (BoxObj& box) { + box._l = 0; + box._b = 0; + box._r = 0; + box._t = 0; +} + +static const short UniLevel = 0; +static const long SLACK = 1000; + +/**********************************************************/ +EventMapper::EventMapper () {} +EventMapper::~EventMapper () {} + +/*****************************************************************************/ + +class DragImpl { +public: + DragImpl (USec, USec, long, long, float); + virtual ~DragImpl(); + + USec init(Event&); + USec map(Event&); + USec relax(); +public: + USec _high; + USec _low; + float _relax; + + USec _cur_rate; + + long _hspeed; + long _lspeed; + + Event _last; +}; + +DragImpl::DragImpl (USec high, USec low, long l, long h, float relax) { + _high = high; + _low = low; + _cur_rate = _high; + _relax = relax; + + _hspeed = h; + _lspeed = l; + + _last.window(nil); +} + +DragImpl::~DragImpl () {} + +USec DragImpl::init (Event& e) { + _last = e; + return _high; +} + +USec DragImpl::map (Event& e) { + USec value = _cur_rate; + if (_last.window() != nil) { + Coord distx = e.pointer_x()-_last.pointer_x(); + Coord disty = e.pointer_y()-_last.pointer_y(); + Coord total_dist = Math::abs(distx)+Math::abs(disty); + unsigned long len = e.time() - _last.time(); + + long speed; + if (len > 0) { + speed = total_dist*1e6/len; + } else { + speed = _hspeed + 1; + } + + if (speed > _hspeed) { + value = _low; + + } else if (speed < _lspeed) { + value = _high; + + } else { + float factor = ((float)(speed-_lspeed))/(_hspeed-_lspeed); + value = (USec) (_high - factor*(_high-_low)); + } + } + _last = e; + if (value > _cur_rate) { + value = _cur_rate; + } else { + _cur_rate = value; + } + + return value; +} + +USec DragImpl::relax () { + if (_cur_rate < _high) { + _cur_rate *= _relax; + } + if (_cur_rate > _high) { + _cur_rate = _high; + } + return _cur_rate; +} + +/*****************************************************************************/ + +DragMapper::DragMapper (USec high, USec low, long l, long h, float relax) { + _impl = new DragImpl(high, low, l, h, relax); +} + +DragMapper::~DragMapper () { + delete _impl; +} + +USec DragMapper::init (Event& e) { + return _impl->init(e); +} + +USec DragMapper::map (Event& e) { + return _impl->map(e); +} + +USec DragMapper::relax () { + return _impl->relax(); +} + +/*****************************************************************************/ +class ContImpl { +public: + ContImpl( USec, USec, Coord, Coord, ContDimension); + virtual ~ContImpl(); + + USec init(Event&); + USec map(Event&); + USec relax(); + + void set_dimension(ContDimension); +public: + USec _high; + USec _low; + USec _cur_rate; + Coord _short; + Coord _long; + ContDimension _dimension; + + Event _last; +}; + +ContImpl::ContImpl (USec high, USec low, Coord s, Coord l, ContDimension d) { + _high = high; + _low = low; + + _short = s; + _long = l; + _cur_rate = _high; + _dimension = d; + _last.window(nil); +} + +ContImpl::~ContImpl () {} + +USec ContImpl::init (Event& e) { + _last = e; + return _high; +} + +void ContImpl::set_dimension(ContDimension d) { + _dimension = d; +} + +USec ContImpl::map (Event& e) { + USec value = _cur_rate; + if (_last.window() != nil) { + Coord distx = e.pointer_x()-_last.pointer_x(); + Coord disty = e.pointer_y()-_last.pointer_y(); + Coord total_dist; + + if (_dimension == Cont_XY) { + total_dist = Math::abs(distx)+Math::abs(disty); + + } else if (_dimension == Cont_Y) { + total_dist = Math::abs(disty); + + } else { + total_dist = Math::abs(distx); + } + if (total_dist > _long) { + value = _low; + + } else if (total_dist < _short) { + value = _high; + + } else { + float factor = (total_dist-_short)/(_long-_short); + value = (USec) (_high - factor*(_high-_low)); + } + } + _cur_rate = value; + return value; +} + +USec ContImpl::relax () { + return _cur_rate; +} + +/*****************************************************************************/ +ContMapper::ContMapper ( + USec high, USec low, Coord s, Coord l, ContDimension dimension +) { + _impl = new ContImpl(high, low, s, l, dimension); +} + +ContMapper::~ContMapper () { + delete _impl; +} + +USec ContMapper::init (Event& e) { + return _impl->init(e); +} + +USec ContMapper::map (Event& e) { + return _impl->map(e); +} + +USec ContMapper::relax () { + return _impl->relax(); +} + +void ContMapper::set_dimension(ContDimension d) { + _impl->set_dimension(d); +} + +/*****************************************************************************/ + +Pacer::Pacer () { _parent = nil; } + +Pacer::~Pacer () {} + +void Pacer::append (Pacer*) {} + +void Pacer::prepend (Pacer*) {} + +void Pacer::insert(PacerIndex, Pacer*) {} + +void Pacer::remove (PacerIndex) {} + +void Pacer::remove_all () {} + +void Pacer::delete_all () {} + +PacerIndex Pacer::count () const { return 0; } + +Pacer* Pacer::child (PacerIndex) const { return nil; } + +Pacer* Pacer::get_parent () const { return _parent; } + +void Pacer::set_parent (Pacer* p) { _parent = p; } + +void Pacer::regrade () {} + +void Pacer::pick(SchedulerList&) {} + +/**********************************************************/ + +PolyPacer::PolyPacer () { + _child_list = new PacerList(10); +} + +PolyPacer::~PolyPacer () { + for (int i = 0; i < count(); i++) { + Pacer* c = child(i); + delete c; + } + delete _child_list; +} + +void PolyPacer::pick(SchedulerList& plist) { + for (PacerIndex i = 0; i < count(); i++) { + Pacer* p = child(i); + p->pick(plist); + } +} + +void PolyPacer::regrade () { + for (PacerIndex i = 0; i < count(); i++) { + child(i)->regrade(); + } +} + +void PolyPacer::append (Pacer* gp) { + if (gp != nil) { + _child_list->append(gp); + gp->set_parent(this); + } +} + +void PolyPacer::prepend (Pacer* gp) { + if (gp != nil) { + _child_list->prepend(gp); + gp->set_parent(this); + } +} + +void PolyPacer::insert(PacerIndex i, Pacer* gp) { + if (gp != nil) { + _child_list->insert(i, gp); + gp->set_parent(this); + } +} + +void PolyPacer::remove (PacerIndex i) { + Pacer* p = child(i); + if (p != nil) { + _child_list->remove(i); + p->set_parent(nil); + } +} + +void PolyPacer::remove_all () { + for (PacerIndex i = 0; i < count(); i++) { + Pacer* p = child(i); + p->set_parent(nil); + } + _child_list->remove_all(); +} + +void PolyPacer::delete_all () { + for (PacerIndex i = 0; i < count(); i++) { + Pacer* p = child(i); + delete p; + } + _child_list->remove_all(); +} + +PacerIndex PolyPacer::count () const { + return _child_list->count(); +} + +Pacer* PolyPacer::child (PacerIndex i) const { + return _child_list->item(i); +} + +/**********************************************************/ + +Grader::Grader (GradeCollector* g) { + _collector = g; + if (_collector != nil) { + _collector->set_pacer(this); + } +} + +Grader::~Grader () { + delete _collector; +} + +GradeCollector* Grader::get_collector () const { return _collector; } + +void Grader::set_collector (GradeCollector* g) { + if (g != _collector) { + delete _collector; + _collector = g; + if (_collector != nil) { + _collector->set_pacer(this); + } + } +} + +void Grader::play (RunTime& rtime) { + GradeCollector* collector = get_collector(); + if (collector != nil) { + collector->play(rtime); + } +} + +void Grader::get_grades(Grade& low, Grade& high) { + GradeCollector* collector = get_collector(); + if (collector != nil) { + Grade l, h; + collector->get_grades(l, h); + low = l; high = h; + } +} + +void Grader::regrade () { + GradeCollector* collector = get_collector(); + if (collector != nil) { + collector->regrade(); + } +} + +/**********************************************************/ + +UniPacer::UniPacer () { _kid = nil; } + +UniPacer::~UniPacer () { delete _kid; } + +Pacer* UniPacer::get_kid () const { return _kid; } + +void UniPacer::set_kid (Pacer* k) { + if (_kid != k) { + if (_kid != nil) { + _kid->set_parent(nil); + } + _kid = k; + if (_kid != nil) { + _kid->set_parent(this); + } + } +} + +void UniPacer::pick(SchedulerList& plist) { + if (_kid != nil) { + _kid->pick(plist); + } +} + +void UniPacer::regrade () { + if (_kid != nil) { + _kid->regrade(); + } +} + +void UniPacer::append (Pacer* p) { + set_kid(p); +} + +void UniPacer::prepend (Pacer* p) { + set_kid(p); +} + +void UniPacer::insert (PacerIndex i, Pacer* p) { + if (i == 0) { + set_kid(p); + } +} + +void UniPacer::remove (PacerIndex i) { + if (i == 0) { + if (_kid != nil) { + _kid->set_parent(nil); + } + _kid = nil; + } +} + +void UniPacer::remove_all () { + remove(0); +} + +void UniPacer::delete_all () { + delete _kid; + _kid = nil; +} + +PacerIndex UniPacer::count () const { + if (_kid == nil) { + return 0; + } else { + return 1; + } +} + +Pacer* UniPacer::child (PacerIndex i) const { + if (i == 0) { + return _kid; + } else { + return nil; + } +} + +void UniPacer::play (RunTime& rtime) { + if (_kid != nil) { + _kid->play(rtime); + } +} + +void UniPacer::get_grades (Grade& low, Grade& high) { + if (_kid != nil) { + Grade l, h; + _kid->get_grades(l, h); + low = l; high = h; + } else { + low = high = 0; + } +} + +/**********************************************************/ +Scheduler::Scheduler (USec period) { + _period = period; +} + +void Scheduler::set_period (USec period) { + if (period != _period) { + _period = period; + PaceMaker* maker = PaceMaker::instance(); + maker->get_pacekeeper()->adjust(this); + } +} + +USec Scheduler::get_period () { return _period; } + +void Scheduler::pick (SchedulerList& plist) { + plist.append(this); +} + +void Scheduler::start (Sec, USec) {} + +void Scheduler::stop (Sec, USec) {} + +void Scheduler::play (RunTime& rtime) { + Grade low, high; + get_grades(low, high); + + FadeType f = fadetype( + rtime._cur_grade, rtime._fut_grade, low, high + ); + + if (f != no_fade) { + //USec slack = SLACK; + PaceMaker::instance()->cont(this, _period); + UniPacer::play(rtime); + //PaceMaker::instance()->cont(this, slack); + } +} + +/**********************************************************/ +UIScheduler::UIScheduler ( + EventMapper* emapper +) : Scheduler(-1) { + _emapper = emapper; + _playing = false; +} + +UIScheduler::~UIScheduler () { + delete _emapper; +} + +void UIScheduler::start (Sec, USec) { + _playing = true; +} + +void UIScheduler::stop (Sec, USec) { + _playing = false; +} + +void UIScheduler::play (RunTime& rtime) { + if (_playing) { + Scheduler::play(rtime); + set_period(_emapper->relax()); + } +} + +void UIScheduler::cur_event (Event& e) { + if (!_playing) { + set_period(_emapper->init(e)); + } else { + set_period(_emapper->map(e)); + PaceMaker::instance()->cont(this, -1); + } +} + +void UIScheduler::set_mapper (EventMapper* emapper) { + delete _emapper; + _emapper = emapper; +} + +/**********************************************************/ +ActionPacer::ActionPacer (Action* before, Action* after) { + _before = before; + _after = after; + Resource::ref(_before); + Resource::ref(_after); +} + +ActionPacer::~ActionPacer () { + Resource::unref(_before); + Resource::unref(_after); +} + +void ActionPacer::set_before (Action* before) { + Resource::ref(before); + Resource::unref(_before); + _before = before; +} + +void ActionPacer::set_after (Action* after) { + Resource::ref(after); + Resource::unref(_after); + _after = after; +} + +void ActionPacer::play (RunTime& rtime) { + if (_before != nil) { + _before->execute(); + } + UniPacer::play(rtime); + if (_after != nil) { + _after->execute(); + } +} + +/**********************************************************/ +GraphicPacer::GraphicPacer (Canvas* c, Graphic* gr) { + _gr = gr; + _canvas = c; + Resource::ref(_gr); + _low = _high = UniLevel; +} + +GraphicPacer::~GraphicPacer () { + Resource::unref(_gr); +} + +BoxObj GraphicPacer::_damage; + +BoxObj& GraphicPacer::damaged_area () { return _damage; } + +void GraphicPacer::incur (BoxObj& box) { + if (!damaged(_damage)) { + _damage = box; + } else { + _damage = _damage + box; + } +} + +void GraphicPacer::clear () { + ::clear(_damage); +} + +void GraphicPacer::get_grades (Grade& low, Grade& high) { + low = _low; + high = _high; +} + +void GraphicPacer::set_grades (Grade low, Grade high) { + _low = low; + _high = high; +} + +void GraphicPacer::set_graphic (Graphic* gr) { + Resource::ref(gr); + Resource::unref(_gr); + _gr = gr; +} + +void GraphicPacer::play (RunTime& rtime) { + if (_canvas == nil) { + return; + } + + Grade& cur = rtime._cur_grade; + Grade& fut = rtime._fut_grade; + + FadeType f = fadetype(cur, fut, _low, _high); + + boolean to_draw = false; + + switch (f) { + case sustain: + { + to_draw = true; + } + break; + case fadein_low: + case fadein_high: + { + //_gr->alpha_stroke(true); + //_gr->alpha_fill(true); + to_draw = true; + } + break; + case fadeout_low: + case fadeout_high: + { +/* + Coord l, b, r, t; + _gr->getbounds(l, b, r, t); + if ((r-l)*(t-b) < 100000.0) { + _gr->alpha_stroke(true); + _gr->alpha_fill(true); + to_draw = true; + } +*/ + } + break; + case no_fade: + break; + } + if (to_draw) { + _gr->drawclipped( + _canvas, _damage._l, _damage._b, _damage._r, _damage._t + ); + } + _gr->alpha_stroke(false); + _gr->alpha_fill(false); +} + +/**********************************************************/ + +Repairer::Repairer ( + Canvas* c, Graphic* gr +) : GraphicPacer(c, gr) {} + +void Repairer::incur (BoxObj& box) { + if (!damaged(_total)) { + _total = box; + } else { + _total = _total + box; + } +} + +void Repairer::clear () { + ::clear(_total); +} + +BoxObj& Repairer::damaged_area () { return _total; } + +/**********************************************************/ + +Filler::Filler ( + Canvas* c, Graphic* gr, const Color* fill +) : Repairer(c, gr) { + _fill = fill; + Resource::ref(_fill); +} + +Filler::~Filler () { + Resource::unref(_fill); +} + +void Filler::play (RunTime& rtime) { + if (_canvas == nil) { + return; + } + + Grade& cur = rtime._cur_grade; + Grade& fut = rtime._fut_grade; + + FadeType f = fadetype(cur, fut, _low, _high); + if (f != no_fade) { + if (damaged(_total)) { + _canvas->fill_rect( + _total._l, _total._b, _total._r, _total._t, _fill + ); + ::clear(_total); + } + } +} + +/**********************************************************/ + +FCGraphicPacer::FCGraphicPacer ( + Canvas* c, Graphic* gr, const Color* fill +) : Filler(c, gr, fill) {} + +FCGraphicPacer::~FCGraphicPacer () {} + +void FCGraphicPacer::play (RunTime& rtime) { + if (_canvas == nil) { + return; + } + + Grade& cur = rtime._cur_grade; + Grade& fut = rtime._fut_grade; + + FadeType f = fadetype(cur, fut, _low, _high); + if (f == fadein_low || f == fadein_high || f == sustain) { + if (damaged(_total)) { + CanvasRep* crep = _canvas->rep(); + BoxObj box = _clip-_total; + + _canvas->damage(box._l, box._b, box._r, box._t); + crep->start_repair(); + _canvas->fill_rect( + _total._l, _total._b, _total._r, _total._t, _fill + ); + _gr->drawclipped( + _canvas, _total._l, _total._b, _total._r, _total._t + ); + _gr->alpha_fill(false); + _gr->alpha_stroke(false); + + crep->finish_repair(); + _canvas->window()->display()->sync(); + + ::clear(_total); + } + } +} + +/**********************************************************/ + +Fixer::Fixer (Canvas* c, Graphic* gr) : Repairer(c, gr) {} + +void Fixer::play (RunTime& rtime) { + Grade& cur = rtime._cur_grade; + Grade& fut = rtime._fut_grade; + + FadeType f = fadetype(cur, fut, _low, _high); + if (f != no_fade) { + _gr->drawclipped( + _canvas, _total._l, _total._b, _total._r, _total._t + ); + ::clear(_total); + } +} +/**********************************************************/ +SelectPacer::SelectPacer (Canvas* c, Graphic* gr) { + _canvas = c; + _gr = gr; + Resource::ref(_gr); +} + +SelectPacer::~SelectPacer () { + Resource::unref(_gr); +} + +void SelectPacer::set_graphic (Graphic* gr) { + Resource::ref(gr); + Resource::unref(_gr); + _gr = gr; +} + +void SelectPacer::play (RunTime& rtime) { + if (!damaged(GraphicPacer::damaged_area())) { + return; + } + _gr->alpha_fill(true); + _gr->alpha_stroke(true); + + UniPacer::play(rtime); + + _gr->alpha_fill(false); + _gr->alpha_stroke(false); + + GraphicPacer::clear(); +} +/**********************************************************/ +Clipper::Clipper (Canvas* c, BoxObj* box) { + _canvas = c; + _box = box; +} + +Clipper::~Clipper () {} + +void Clipper::play (RunTime& rtime) { + if (damaged(*_box)) { + CanvasRep* crep = _canvas->rep(); + BoxObj box = _allot-*_box; + + _canvas->damage(box._l, box._b, box._r, box._t); + crep->start_repair(); + + UniPacer::play(rtime); + + crep->finish_repair(); + _canvas->window()->display()->sync(); + + GraphicPacer::clear(); + } +} + +/**********************************************************/ +XorPacer::XorPacer ( + Canvas* c, Graphic* g, const Color* color +) : GraphicPacer(c, g) { + _color = new Color(*color, 1.0, Color::Xor); + _color->ref(); + _brush = new Brush(0.0); + _brush->ref(); + _drawn = false; + + _t = nil; + set_graphic(g); +} + +XorPacer::~XorPacer () { + Resource::unref(_color); + Resource::unref(_brush); + Resource::unref(_t); +} + +void XorPacer::set_graphic (Graphic* g) { + GraphicPacer::set_graphic(g); + if (g != nil) { + Resource::unref(_t); + _t = new Transformer; + _gr->eqv_transformer(*_t); + + if (_gr->count_() > 0) { + _gr->getbounds(_box._l, _box._b, _box._r, _box._t); + _t->inverse_transform(_box._l, _box._b); + _t->inverse_transform(_box._r, _box._t); + } else { + _gr->get_max_min(_box._l, _box._b, _box._r, _box._t); + } + } +} + +void XorPacer::play (RunTime& rtime) { + Grade& cur = rtime._cur_grade; + Grade& fut = rtime._fut_grade; + + FadeType f = fadetype(cur, fut, _low, _high); + if (f == fadeout_low || f == fadeout_high) { + if (_drawn) { + printf("fade out\n"); + xor(); + } + } else if (f == fadein_low || f == fadein_high) { + if (!_drawn) { + _gr->eqv_transformer(*_t); + xor(); + GraphicPacer::clear(); + } + } else if (f != no_fade) { + if (_drawn) { + xor(); + } + _gr->eqv_transformer(*_t); + xor(); + GraphicPacer::clear(); + } +} + +void XorPacer::xor () { + boolean doit = false; + if (!_drawn) { + if (damaged(_damage)) { + _drawn = true; + doit = true; + } + } else { + doit = true; + _drawn = false; + } + if (doit) { + _canvas->push_clipping(); + _canvas->clip_rect(_allot._l, _allot._b, _allot._r, _allot._t); + _canvas->front_buffer(); + _canvas->push_transform(); + _canvas->transform(*_t); + _canvas->rect( + _box._l, _box._b, _box._r, _box._t, _color, _brush + ); + _canvas->pop_transform(); + _canvas->pop_clipping(); + _canvas->back_buffer(); + _canvas->window()->display()->sync(); + } +} diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/edraw/pacer.h iv-3.1-g++2.7.2/iv/src/examples/edraw/pacer.h --- iv-3.1/iv/src/examples/edraw/pacer.h Thu Jan 1 01:00:00 1970 +++ iv-3.1-g++2.7.2/iv/src/examples/edraw/pacer.h Tue Apr 2 13:52:36 1996 @@ -0,0 +1,364 @@ +#ifndef pacer_h +#define pacer_h + +#include +#include "globals.h" + +class Action; +class Brush; +class Canvas; +class Color; +class ContImpl; +class Graphic; +class GradeCollector; +class Transformer; +class DragImpl; + +static const long SlowRate = 1e6; +static const long FastRate = 50e3; +static const long RelaxRate = 5e3; + +static const long LowSpeed = 10000; +static const long HighSpeed = 1000000; + +static const float ShortDist = 10.0; +static const float LongDist = 50.0; + +class EventMapper { +public: + virtual ~EventMapper(); + + virtual USec init(Event&) = 0; + virtual USec map(Event&) = 0; + virtual USec relax() = 0; +protected: + EventMapper(); +}; + +class DragMapper : public EventMapper { +public: + DragMapper( + USec = SlowRate, USec = FastRate, long = LowSpeed, long = HighSpeed, + float _relax_factor = 1.15 + ); + virtual ~DragMapper(); + + virtual USec init(Event&); + virtual USec map(Event&); + virtual USec relax(); +private: + DragImpl* _impl; +}; + +typedef unsigned int ContDimension; + +enum { + Cont_X = 0, Cont_Y, Cont_XY +}; + +class ContMapper : public EventMapper { +public: + ContMapper( + USec = SlowRate, USec = FastRate, + Coord = ShortDist, Coord = LongDist, ContDimension = Cont_XY + ); + virtual ~ContMapper(); + + virtual USec init(Event&); + virtual USec map(Event&); + virtual USec relax(); + + void set_dimension(ContDimension); + +private: + ContImpl* _impl; +}; + +class Pacer { +public: + virtual ~Pacer(); + + virtual void append(Pacer*); + virtual void prepend(Pacer*); + virtual void insert(PacerIndex, Pacer*); + virtual void remove(PacerIndex); + virtual void remove_all(); + virtual void delete_all(); + virtual PacerIndex count() const; + virtual Pacer* child(PacerIndex) const; + + virtual Pacer* get_parent() const; + virtual void set_parent(Pacer*); + + virtual void play(RunTime&) = 0; + virtual void pick(SchedulerList&); + + virtual void get_grades(Grade& low, Grade& high) = 0; + virtual void regrade(); + +protected: + Pacer(); +protected: + Pacer* _parent; +}; + +class PolyPacer : public Pacer { +public: + virtual ~PolyPacer(); + + virtual void play(RunTime&) = 0; + virtual void get_grades(Grade& low, Grade& high) = 0; + + virtual void pick(SchedulerList&); + virtual void regrade(); + + virtual void append(Pacer*); + virtual void prepend(Pacer*); + virtual void insert(PacerIndex, Pacer*); + virtual void remove(PacerIndex); + virtual void remove_all(); + virtual void delete_all(); + virtual PacerIndex count() const; + virtual Pacer* child(PacerIndex) const; +protected: + PolyPacer(); +protected: + PacerList* _child_list; +}; + +class Grader : public PolyPacer { +public: + Grader(GradeCollector* = nil); + virtual ~Grader(); + + GradeCollector* get_collector() const; + void set_collector(GradeCollector*); + + virtual void play(RunTime&); + + virtual void get_grades(Grade& low, Grade& high); + virtual void regrade(); +protected: + GradeCollector* _collector; +}; + +class UniPacer : public Pacer { +public: + UniPacer(); + virtual ~UniPacer(); + + virtual Pacer* get_kid() const; + virtual void set_kid(Pacer*); + + virtual void append(Pacer*); + virtual void prepend(Pacer*); + virtual void insert(PacerIndex, Pacer*); + virtual void remove(PacerIndex); + virtual void remove_all(); + virtual void delete_all(); + virtual PacerIndex count() const; + virtual Pacer* child(PacerIndex) const; + + virtual void play(RunTime&); + virtual void regrade(); + + virtual void pick(SchedulerList&); + virtual void get_grades(Grade& low, Grade& high); +protected: + Pacer* _kid; +}; + +class Scheduler : public UniPacer { +public: + Scheduler(USec period); + + virtual void set_period(USec period); + virtual USec get_period(); + + virtual void start(Sec, USec); + virtual void stop(Sec, USec); + + virtual void play(RunTime&); + + virtual void pick(SchedulerList&); +protected: + USec _period; +}; + +class UIScheduler : public Scheduler { +public: + UIScheduler(EventMapper*); + virtual ~UIScheduler(); + + virtual void start(Sec, USec); + virtual void stop(Sec, USec); + + virtual void play(RunTime&); + virtual void cur_event(Event&); + + void set_mapper(EventMapper*); +protected: + EventMapper* _emapper; + boolean _playing; + + USec _event_usec; + Sec _event_sec; +}; + +class ActionPacer : public UniPacer { +public: + ActionPacer(Action* before = nil, Action* after = nil); + virtual ~ActionPacer(); + + virtual void play(RunTime&); + + void set_before(Action*); + void set_after(Action*); +protected: + Action* _before; + Action* _after; +}; + +class GraphicPacer : public Pacer { +public: + GraphicPacer(Canvas*, Graphic*); + virtual ~GraphicPacer(); + + + virtual Graphic* get_graphic() const; + virtual void set_graphic(Graphic*); + void set_grades(Grade low, Grade high); + + virtual void play(RunTime&); + virtual void get_grades(Grade& low, Grade& high); + + static BoxObj& damaged_area(); + static void incur(BoxObj&); + static void clear(); +protected: + static BoxObj _damage; +protected: + Canvas* _canvas; + Graphic* _gr; + Grade _low, _high; +}; + +inline Graphic* GraphicPacer::get_graphic () const { return _gr; } + +class Repairer : public GraphicPacer { +public: + virtual void incur(BoxObj&); + virtual void clear(); + virtual BoxObj& damaged_area(); + + virtual void play(RunTime&) = 0; +protected: + Repairer(Canvas*, Graphic*); +protected: + BoxObj _total; +}; + +class Filler : public Repairer { +public: + Filler(Canvas*, Graphic*, const Color* fill); + virtual ~Filler(); + + virtual void play(RunTime&); +protected: + const Color* _fill; +}; + +class FCGraphicPacer : public Filler { +public: + FCGraphicPacer(Canvas*, Graphic*, const Color* fill); + virtual ~FCGraphicPacer(); + + void set_clipped (BoxObj&); + + virtual void play(RunTime&); +protected: + BoxObj _clip; +}; + +inline void FCGraphicPacer::set_clipped(BoxObj& clip) { _clip = clip; } + +class Fixer : public Repairer { +public: + Fixer(Canvas*, Graphic*); + + virtual void play(RunTime&); +}; + +class SelectPacer : public UniPacer { +public: + SelectPacer(Canvas*, Graphic*); + virtual ~SelectPacer(); + + void set_damaged(BoxObj*); + void set_clipped (BoxObj&); + void set_graphic(Graphic*); + + virtual void play(RunTime&); +protected: + Canvas* _canvas; + Graphic* _gr; + BoxObj* _box; + BoxObj _allot; +}; + +inline void SelectPacer::set_damaged(BoxObj* box) { _box = box; } +inline void SelectPacer::set_clipped(BoxObj& allot) { _allot = allot; } + + +class Clipper : public UniPacer { +public: + Clipper(Canvas*, BoxObj*); + virtual ~Clipper(); + + void set_damaged(BoxObj*); + void set_clipped (BoxObj&); + + virtual void play(RunTime&); +protected: + Canvas* _canvas; + BoxObj* _box; + BoxObj _allot; +}; + +inline void Clipper::set_damaged(BoxObj* box) { _box = box; } +inline void Clipper::set_clipped(BoxObj& allot) { _allot = allot; } + + +class XorPacer : public GraphicPacer { +public: + XorPacer(Canvas*, Graphic*, const Color*); + virtual ~XorPacer(); + + virtual void set_graphic(Graphic*); + void set_clipped (BoxObj&); + + virtual void play(RunTime&); +protected: + void xor(); +protected: + Color* _color; + Brush* _brush; + BoxObj _box; + BoxObj _allot; + Transformer* _t; + boolean _drawn; +}; + +inline void XorPacer::set_clipped(BoxObj& allot) { _allot = allot; } + +class Player : public PolyPacer { +public: + Player(Pacer*, TimeSlice&); + + virtual void play(RunTime&); +protected: + Pacer* _actor; + TimeSlice _schedule; +}; + +#endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/gl/main.c iv-3.1-g++2.7.2/iv/src/examples/gl/main.c --- iv-3.1/iv/src/examples/gl/main.c Fri Jul 10 00:59:54 1992 +++ iv-3.1-g++2.7.2/iv/src/examples/gl/main.c Tue Apr 2 13:52:36 1996 @@ -1,3 +1,4 @@ +#include #include #include #include @@ -7,7 +8,6 @@ #include #include #include -#include class GLPolygonTest : public Glyph { public: diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/image/main.c iv-3.1-g++2.7.2/iv/src/examples/image/main.c --- iv-3.1/iv/src/examples/image/main.c Thu May 14 01:00:50 1992 +++ iv-3.1-g++2.7.2/iv/src/examples/image/main.c Tue Apr 2 13:52:36 1996 @@ -49,7 +49,7 @@ } session->run_window( new ApplicationWindow( - kit.inset_frame( + /* kit.inset_frame( */ layout.variable_span( new TransformFitter( new TransformSetter( @@ -57,7 +57,7 @@ ) ) ) - ) + /* ) */ ) ); } diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/ips/figure.c iv-3.1-g++2.7.2/iv/src/examples/ips/figure.c --- iv-3.1/iv/src/examples/ips/figure.c Fri Jul 10 23:55:15 1992 +++ iv-3.1-g++2.7.2/iv/src/examples/ips/figure.c Tue Apr 2 13:52:36 1996 @@ -51,8 +51,8 @@ Resource::unref(_brush); Resource::unref(_stroke); Resource::unref(_fill); - delete _x; - delete _y; + delete [] _x; + delete [] _y; } void Figure::add_point(Coord x, Coord y) { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/examples/preview/main.c iv-3.1-g++2.7.2/iv/src/examples/preview/main.c --- iv-3.1/iv/src/examples/preview/main.c Mon Dec 14 17:59:53 1992 +++ iv-3.1-g++2.7.2/iv/src/examples/preview/main.c Tue Apr 2 13:52:36 1996 @@ -160,36 +160,58 @@ const Font* f = kit.font(); const Color* fg = kit.foreground(); Glyph* g[256]; - for (int i = 0; i < 256; i++) { - g[i] = new Character(i, f, fg); + for (int i = 0; i < 256; i++) + { + Resource::ref( g[i] = new Character(i, f, fg) ); } Resource::unref(g['\n']); - g['\n'] = layout.discretionary( - PenaltyGood, - end_par_, - end_par_, - layout.discretionary(0, interline_, vfil_glue_, nil, nil), - begin_par_ + + Resource::ref( g['\n'] = + layout.discretionary( + PenaltyGood, + end_par_, + end_par_, + layout.discretionary(0, + interline_, + vfil_glue_, + nil, + nil + ), + begin_par_ + ) ); Resource::unref(g[' ']); - g[' '] = layout.discretionary( - 0, - word_space_, - end_line_, - layout.discretionary(0, interline_, vfil_glue_, nil, nil), - begin_line_ + + Resource::ref( + g[' '] = layout.discretionary( + 0, + word_space_, + end_line_, + layout.discretionary(0, + interline_, + vfil_glue_, + nil, + nil + ), + begin_line_ + ) ); Resource::unref(g['\t']); + // g['\t'] = layout.shape_of(g['M']); - g['\t'] = new Label(" ", f, fg); + Resource::ref( g['\t'] = new Label(" ", f, fg) ); page_->append(begin_par_); for (; p < end; p++) { page_->append(g[*((unsigned char*)p)]); } + + for (int ii=0; i<256; i++) { + Resource::unref( g[ii] ); + }; } Adjustable* DocumentView::adjustable() const { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Dispatch/dispatcher.h iv-3.1-g++2.7.2/iv/src/include/Dispatch/dispatcher.h --- iv-3.1/iv/src/include/Dispatch/dispatcher.h Wed Nov 27 00:56:31 1991 +++ iv-3.1-g++2.7.2/iv/src/include/Dispatch/dispatcher.h Tue Apr 2 13:52:36 1996 @@ -29,11 +29,16 @@ #ifndef dp_dispatcher_h #define dp_dispatcher_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class FdMask; class IOHandler; class TimerQueue; +class ChildQueue; struct timeval; class Dispatcher { @@ -54,6 +59,9 @@ virtual void startTimer(long sec, long usec, IOHandler*); virtual void stopTimer(IOHandler*); + virtual void startChild(int pid, IOHandler*); + virtual void stopChild(IOHandler*); + virtual boolean setReady(int fd, DispatcherMask); virtual void dispatch(); virtual boolean dispatch(long& sec, long& usec); @@ -69,7 +77,7 @@ virtual int waitFor(FdMask&, FdMask&, FdMask&, timeval*); virtual void notify(int, FdMask&, FdMask&, FdMask&); virtual timeval* calculateTimeout(timeval*) const; - virtual void handleError(); + virtual boolean handleError(); virtual void checkConnections(); protected: int _nfds; @@ -83,6 +91,13 @@ IOHandler** _wtable; IOHandler** _etable; TimerQueue* _queue; + ChildQueue* _cqueue; + +#if defined(sgi) || defined(__alpha__) || defined(__linux__) + static void sigCLD(...); +#else + static void sigCLD(); +#endif private: static Dispatcher* _instance; private: diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Dispatch/dp.h iv-3.1-g++2.7.2/iv/src/include/Dispatch/dp.h --- iv-3.1/iv/src/include/Dispatch/dp.h Fri May 24 18:15:10 1991 +++ iv-3.1-g++2.7.2/iv/src/include/Dispatch/dp.h Tue Apr 2 13:52:36 1996 @@ -25,6 +25,10 @@ #ifndef dp_h #define dp_h +#ifdef __GNUG__ +#pragma interface +#endif + #if defined(__STDC__) || defined(__ANSI_CPP__) #define _lib_dp(name) dp##name #else diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Dispatch/iocallback.h iv-3.1-g++2.7.2/iv/src/include/Dispatch/iocallback.h --- iv-3.1/iv/src/include/Dispatch/iocallback.h Mon Jun 1 23:06:05 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Dispatch/iocallback.h Tue Apr 2 13:52:36 1996 @@ -25,6 +25,10 @@ #ifndef dp_iocallback_h #define dp_iocallback_h +#ifdef __GNUG__ +#pragma interface +#endif + /* * IOCallback allows a member function to be used as an IO handler * instead of requiring derivation of a subclass. diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Dispatch/iohandler.h iv-3.1-g++2.7.2/iv/src/include/Dispatch/iohandler.h --- iv-3.1/iv/src/include/Dispatch/iohandler.h Mon May 6 22:11:13 1991 +++ iv-3.1-g++2.7.2/iv/src/include/Dispatch/iohandler.h Tue Apr 2 13:52:37 1996 @@ -25,7 +25,12 @@ #ifndef dp_iohandler_h #define dp_iohandler_h +#ifdef __GNUG__ +#pragma interface +#endif + #include +#include // Derived classes read input on a file number, write output on a file // number, handle an exception raised on a file number, or handle a @@ -41,6 +46,7 @@ virtual int outputReady(int fd); virtual int exceptionRaised(int fd); virtual void timerExpired(long sec, long usec); + virtual void childStatus(pid_t pid, int status); }; #endif diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Dispatch/iostreamb.h iv-3.1-g++2.7.2/iv/src/include/Dispatch/iostreamb.h --- iv-3.1/iv/src/include/Dispatch/iostreamb.h Fri Jan 25 00:30:41 1991 +++ iv-3.1-g++2.7.2/iv/src/include/Dispatch/iostreamb.h Tue Apr 2 13:52:37 1996 @@ -25,6 +25,10 @@ #ifndef dp_iostreamb_h #define dp_iostreamb_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Dispatch/rpcbuf.h iv-3.1-g++2.7.2/iv/src/include/Dispatch/rpcbuf.h --- iv-3.1/iv/src/include/Dispatch/rpcbuf.h Thu Jan 24 21:53:14 1991 +++ iv-3.1-g++2.7.2/iv/src/include/Dispatch/rpcbuf.h Tue Apr 2 13:52:37 1996 @@ -25,6 +25,10 @@ #ifndef dp_rpcbuf_h #define dp_rpcbuf_h +#ifdef __GNUG__ +#pragma interface +#endif + #include // Specialize streambuf to sending and receiving RPC requests to and diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Dispatch/rpchdr.h iv-3.1-g++2.7.2/iv/src/include/Dispatch/rpchdr.h --- iv-3.1/iv/src/include/Dispatch/rpchdr.h Tue Nov 19 00:34:25 1991 +++ iv-3.1-g++2.7.2/iv/src/include/Dispatch/rpchdr.h Tue Apr 2 13:52:37 1996 @@ -25,6 +25,10 @@ #ifndef dp_rpchdr_h #define dp_rpchdr_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class rpcstream; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Dispatch/rpcpeer.h iv-3.1-g++2.7.2/iv/src/include/Dispatch/rpcpeer.h --- iv-3.1/iv/src/include/Dispatch/rpcpeer.h Thu Mar 28 22:41:54 1991 +++ iv-3.1-g++2.7.2/iv/src/include/Dispatch/rpcpeer.h Tue Apr 2 13:52:37 1996 @@ -25,6 +25,10 @@ #ifndef dp_rpcpeer_h #define dp_rpcpeer_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class rpcbuf; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Dispatch/rpcreader.h iv-3.1-g++2.7.2/iv/src/include/Dispatch/rpcreader.h --- iv-3.1/iv/src/include/Dispatch/rpcreader.h Tue Nov 19 00:34:26 1991 +++ iv-3.1-g++2.7.2/iv/src/include/Dispatch/rpcreader.h Tue Apr 2 13:52:37 1996 @@ -25,6 +25,10 @@ #ifndef dp_rpcreader_h #define dp_rpcreader_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class RpcHdr; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Dispatch/rpcregistry.h iv-3.1-g++2.7.2/iv/src/include/Dispatch/rpcregistry.h --- iv-3.1/iv/src/include/Dispatch/rpcregistry.h Thu Mar 28 22:41:55 1991 +++ iv-3.1-g++2.7.2/iv/src/include/Dispatch/rpcregistry.h Tue Apr 2 13:52:37 1996 @@ -25,6 +25,10 @@ #ifndef dp_rpcregistry_h #define dp_rpcregistry_h +#ifdef __GNUG__ +#pragma interface +#endif + #include // Store or retrieve a RPC service's hostname and port number so that diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Dispatch/rpcservice.h iv-3.1-g++2.7.2/iv/src/include/Dispatch/rpcservice.h --- iv-3.1/iv/src/include/Dispatch/rpcservice.h Thu Mar 28 22:41:56 1991 +++ iv-3.1-g++2.7.2/iv/src/include/Dispatch/rpcservice.h Tue Apr 2 13:52:37 1996 @@ -25,6 +25,10 @@ #ifndef dp_rpcservice_h #define dp_rpcservice_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class rpcbuf; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Dispatch/rpcstream.h iv-3.1-g++2.7.2/iv/src/include/Dispatch/rpcstream.h --- iv-3.1/iv/src/include/Dispatch/rpcstream.h Thu Jan 24 21:53:28 1991 +++ iv-3.1-g++2.7.2/iv/src/include/Dispatch/rpcstream.h Tue Apr 2 13:52:38 1996 @@ -25,6 +25,10 @@ #ifndef dp_rpcstream_h #define dp_rpcstream_h +#ifdef __GNUG__ +#pragma interface +#endif + #include // Modify iostreamb to store a rpcbuf and provide operations on the diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Dispatch/rpcwriter.h iv-3.1-g++2.7.2/iv/src/include/Dispatch/rpcwriter.h --- iv-3.1/iv/src/include/Dispatch/rpcwriter.h Thu Mar 28 22:41:58 1991 +++ iv-3.1-g++2.7.2/iv/src/include/Dispatch/rpcwriter.h Tue Apr 2 13:52:38 1996 @@ -25,6 +25,10 @@ #ifndef dp_rpcwriter_h #define dp_rpcwriter_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class rpcstream; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/adjuster.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/adjuster.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/adjuster.h Tue Feb 11 19:55:00 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/adjuster.h Tue Apr 2 13:52:38 1996 @@ -30,6 +30,10 @@ #ifndef ivlook2_6_adjuster_h #define ivlook2_6_adjuster_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/alignment.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/alignment.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/alignment.h Tue Feb 11 19:55:02 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/alignment.h Tue Apr 2 13:52:38 1996 @@ -29,6 +29,10 @@ #ifndef iv2_6_alignment_h #define iv2_6_alignment_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/banner.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/banner.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/banner.h Tue Feb 11 19:55:03 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/banner.h Tue Apr 2 13:52:38 1996 @@ -29,6 +29,10 @@ #ifndef ivlook2_6_banner_h #define ivlook2_6_banner_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/border.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/border.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/border.h Tue Feb 11 19:55:04 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/border.h Tue Apr 2 13:52:38 1996 @@ -29,6 +29,10 @@ #ifndef ivlook2_6_border_h #define ivlook2_6_border_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/box.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/box.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/box.h Tue Feb 11 19:55:06 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/box.h Tue Apr 2 13:52:38 1996 @@ -29,6 +29,10 @@ #ifndef iv2_6_box_h #define iv2_6_box_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include @@ -50,11 +54,11 @@ Box(); virtual void ComputeShape(Shape*); - virtual void GetActual(int& major, int& minor); + virtual void GetActual(int& major_size, int& minor_size); virtual void GetCanonical(Shape*, BoxCanonical&); BoxElement* Head(); virtual void PlaceElement( - Interactor*, Coord major, int len, int thick, int minor + Interactor*, Coord major_size, int len, int thick, int minor_size ); virtual void Reconfig(); private: @@ -86,7 +90,7 @@ virtual ~HBox(); protected: void ComputeShape(Shape*); - void GetActual(int& major, int& minor); + void GetActual(int& major_size, int& minor_size); void GetCanonical(Shape*, BoxCanonical&); void PlaceElement(Interactor*, Coord, int, int, int); private: @@ -112,7 +116,7 @@ virtual ~VBox(); protected: void ComputeShape(Shape*); - void GetActual(int& major, int& minor); + void GetActual(int& major_size, int& minor_size); void GetCanonical(Shape*, BoxCanonical&); void PlaceElement(Interactor*, Coord, int, int, int); private: diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/button.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/button.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/button.h Tue Feb 11 19:55:07 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/button.h Tue Apr 2 13:52:38 1996 @@ -30,6 +30,10 @@ #ifndef ivlook2_6_button_h #define ivlook2_6_button_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include @@ -49,7 +53,7 @@ void operator=(ButtonState&); void SetValue(int); void SetValue(void*); - void GetValue (int& v) { v = (int)value; } + void GetValue (int& v) { v = int(long(value)); } void GetValue (void*& v) { v = value; } protected: void* value; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/compeditor.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/compeditor.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/compeditor.h Tue Feb 11 20:59:03 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/compeditor.h Tue Apr 2 13:52:41 1996 @@ -29,6 +29,10 @@ #ifndef ivlook2_6_compeditor_h #define ivlook2_6_compeditor_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/control.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/control.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/control.h Tue Oct 27 01:00:36 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/control.h Tue Apr 2 13:52:41 1996 @@ -29,6 +29,10 @@ #ifndef ivlook2_6_control_h #define ivlook2_6_control_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/deck.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/deck.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/deck.h Tue Feb 11 19:55:11 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/deck.h Tue Apr 2 13:52:41 1996 @@ -29,6 +29,10 @@ #ifndef iv2_6_deck_h #define iv2_6_deck_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/dialog.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/dialog.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/dialog.h Tue Feb 11 19:55:13 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/dialog.h Tue Apr 2 13:52:41 1996 @@ -29,6 +29,10 @@ #ifndef ivlook2_6_dialog_h #define ivlook2_6_dialog_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/filebrowser.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/filebrowser.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/filebrowser.h Tue Feb 11 20:59:05 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/filebrowser.h Tue Apr 2 13:52:41 1996 @@ -29,6 +29,10 @@ #ifndef ivlook2_6_filebrowser_h #define ivlook2_6_filebrowser_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/filechooser.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/filechooser.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/filechooser.h Tue Feb 11 20:59:06 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/filechooser.h Tue Apr 2 13:52:41 1996 @@ -29,6 +29,10 @@ #ifndef ivlook2_6_filechooser_h #define ivlook2_6_filechooser_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/frame.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/frame.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/frame.h Tue Feb 11 19:55:18 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/frame.h Tue Apr 2 13:52:41 1996 @@ -29,6 +29,10 @@ #ifndef ivlook2_6_frame_h #define ivlook2_6_frame_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/glue.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/glue.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/glue.h Tue Feb 11 19:55:19 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/glue.h Tue Apr 2 13:52:41 1996 @@ -29,6 +29,10 @@ #ifndef iv2_6_glue_h #define iv2_6_glue_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/ihandler.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/ihandler.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/ihandler.h Tue Feb 18 22:48:20 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/ihandler.h Tue Apr 2 13:52:42 1996 @@ -29,6 +29,10 @@ #ifndef iv2_6_ihandler_h #define iv2_6_ihandler_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/interactor.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/interactor.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/interactor.h Mon Apr 13 19:09:13 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/interactor.h Tue Apr 2 13:52:42 1996 @@ -29,6 +29,10 @@ #ifndef iv2_6_interactor_h #define iv2_6_interactor_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include @@ -95,6 +99,7 @@ virtual void Highlight(boolean on); void Flush(); void Sync(); + static boolean ValidCanvas(Canvas*); /* input events */ boolean Check(); diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/iwindow.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/iwindow.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/iwindow.h Wed Aug 14 17:58:41 1991 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/iwindow.h Tue Apr 2 13:52:42 1996 @@ -29,6 +29,10 @@ #ifndef iv2_6_iwindow_h #define iv2_6_iwindow_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/matcheditor.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/matcheditor.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/matcheditor.h Tue Feb 11 20:59:07 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/matcheditor.h Tue Apr 2 13:52:42 1996 @@ -29,6 +29,10 @@ #ifndef ivlook2_6_matcheditor_h #define ivlook2_6_matcheditor_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/menu.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/menu.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/menu.h Tue Feb 11 20:59:09 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/menu.h Tue Apr 2 13:52:42 1996 @@ -29,6 +29,10 @@ #ifndef ivlook2_6_menu_h #define ivlook2_6_menu_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/message.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/message.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/message.h Tue Feb 11 19:55:25 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/message.h Tue Apr 2 13:52:42 1996 @@ -29,6 +29,10 @@ #ifndef iv2_6_message_h #define iv2_6_message_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/paint.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/paint.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/paint.h Wed Aug 14 17:58:45 1991 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/paint.h Tue Apr 2 13:52:42 1996 @@ -25,6 +25,10 @@ #ifndef iv2_6_paint_h #define iv2_6_paint_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/painter.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/painter.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/painter.h Tue Feb 11 19:55:26 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/painter.h Tue Apr 2 13:52:42 1996 @@ -29,6 +29,10 @@ #ifndef iv2_6_painter_h #define iv2_6_painter_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/panner.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/panner.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/panner.h Tue Feb 11 19:55:27 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/panner.h Tue Apr 2 13:52:43 1996 @@ -29,6 +29,10 @@ #ifndef ivlook2_6_panner_h #define ivlook2_6_panner_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/perspective.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/perspective.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/perspective.h Tue Feb 11 19:55:28 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/perspective.h Tue Apr 2 13:52:43 1996 @@ -30,6 +30,10 @@ #ifndef iv2_6_perspective_h #define iv2_6_perspective_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/rubband.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/rubband.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/rubband.h Tue Feb 11 19:55:30 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/rubband.h Tue Apr 2 13:52:43 1996 @@ -29,6 +29,10 @@ #ifndef iv2_6_rubband_h #define iv2_6_rubband_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/rubcurve.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/rubcurve.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/rubcurve.h Tue Feb 11 19:55:31 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/rubcurve.h Tue Apr 2 13:52:43 1996 @@ -29,6 +29,10 @@ #ifndef iv2_6_rubcurve_h #define iv2_6_rubcurve_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class RubberEllipse : public Rubberband { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/rubgroup.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/rubgroup.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/rubgroup.h Mon Jun 8 09:34:30 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/rubgroup.h Tue Apr 2 13:52:43 1996 @@ -29,6 +29,10 @@ #ifndef iv2_6_rubgroup_h #define iv2_6_rubgroup_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class RubberList; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/rubline.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/rubline.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/rubline.h Tue Feb 11 19:55:34 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/rubline.h Tue Apr 2 13:52:43 1996 @@ -29,6 +29,10 @@ #ifndef iv2_6_rubline_h #define iv2_6_rubline_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class RubberLine : public Rubberband { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/rubrect.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/rubrect.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/rubrect.h Tue Feb 11 19:55:35 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/rubrect.h Tue Apr 2 13:52:43 1996 @@ -29,6 +29,10 @@ #ifndef iv2_6_rubrect_h #define iv2_6_rubrect_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class RubberRect : public Rubberband { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/rubverts.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/rubverts.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/rubverts.h Mon Sep 28 19:09:53 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/rubverts.h Tue Apr 2 13:52:43 1996 @@ -30,6 +30,10 @@ #ifndef iv2_6_rubverts_h #define iv2_6_rubverts_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class GrowingVertices : public Rubberband { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/scene.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/scene.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/scene.h Tue Feb 11 19:55:38 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/scene.h Tue Apr 2 13:52:44 1996 @@ -29,6 +29,10 @@ #ifndef iv2_6_scene_h #define iv2_6_scene_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/scrollbar.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/scrollbar.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/scrollbar.h Tue Feb 11 19:55:40 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/scrollbar.h Tue Apr 2 13:52:44 1996 @@ -29,6 +29,10 @@ #ifndef ivlook2_6_scrollbar_h #define ivlook2_6_scrollbar_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/scroller.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/scroller.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/scroller.h Tue Feb 11 19:55:41 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/scroller.h Tue Apr 2 13:52:44 1996 @@ -29,6 +29,10 @@ #ifndef ivlook2_6_scroller_h #define ivlook2_6_scroller_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/sensor.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/sensor.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/sensor.h Tue Jan 21 23:13:44 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/sensor.h Tue Apr 2 13:52:44 1996 @@ -29,6 +29,10 @@ #ifndef iv2_6_sensor_h #define iv2_6_sensor_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/shape.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/shape.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/shape.h Wed Aug 14 17:59:02 1991 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/shape.h Tue Apr 2 13:52:44 1996 @@ -25,6 +25,10 @@ #ifndef iv2_6_shape_h #define iv2_6_shape_h +#ifdef __GNUG__ +#pragma interface +#endif + #include /* diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/strbrowser.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/strbrowser.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/strbrowser.h Wed Aug 26 18:12:21 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/strbrowser.h Tue Apr 2 13:52:44 1996 @@ -30,6 +30,10 @@ #ifndef ivlook2_6_strbrowser_h #define ivlook2_6_strbrowser_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/strchooser.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/strchooser.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/strchooser.h Tue Feb 11 20:59:10 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/strchooser.h Tue Apr 2 13:52:44 1996 @@ -30,6 +30,10 @@ #ifndef ivlook2_6_strchooser_h #define ivlook2_6_strchooser_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/streditor.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/streditor.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/streditor.h Tue Feb 11 19:55:46 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/streditor.h Tue Apr 2 13:52:44 1996 @@ -29,6 +29,10 @@ #ifndef ivlook2_6_streditor_h #define ivlook2_6_streditor_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/subject.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/subject.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/subject.h Wed Dec 4 01:24:15 1991 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/subject.h Tue Apr 2 13:52:45 1996 @@ -30,6 +30,10 @@ #ifndef iv2_6_subject_h #define iv2_6_subject_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/textbuffer.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/textbuffer.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/textbuffer.h Wed Sep 25 21:51:57 1991 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/textbuffer.h Tue Apr 2 13:52:45 1996 @@ -29,6 +29,10 @@ #ifndef iv2_6_textbuffer_h #define iv2_6_textbuffer_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Regexp; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/textdisplay.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/textdisplay.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/textdisplay.h Tue Feb 11 19:55:47 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/textdisplay.h Tue Apr 2 13:52:45 1996 @@ -29,6 +29,10 @@ #ifndef iv2_6_textdisplay_h #define iv2_6_textdisplay_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/texteditor.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/texteditor.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/texteditor.h Tue Feb 11 19:55:48 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/texteditor.h Tue Apr 2 13:52:45 1996 @@ -29,6 +29,10 @@ #ifndef ivlook2_6_texteditor_h #define ivlook2_6_texteditor_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/textstyle.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/textstyle.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/textstyle.h Wed Aug 14 17:59:07 1991 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/textstyle.h Tue Apr 2 13:52:45 1996 @@ -25,6 +25,10 @@ #ifndef iv2_6_textstyle_h #define iv2_6_textstyle_h +#ifdef __GNUG__ +#pragma interface +#endif + #include enum TextStyle { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/tray.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/tray.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/tray.h Tue Feb 11 19:55:49 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/tray.h Tue Apr 2 13:52:45 1996 @@ -29,6 +29,10 @@ #ifndef iv2_6_tray_h #define iv2_6_tray_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/viewport.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/viewport.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/viewport.h Tue Feb 11 19:55:51 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/viewport.h Tue Apr 2 13:52:45 1996 @@ -32,6 +32,10 @@ #ifndef iv2_6_viewport_h #define iv2_6_viewport_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-2_6/InterViews/world.h iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/world.h --- iv-3.1/iv/src/include/IV-2_6/InterViews/world.h Thu Mar 19 22:27:10 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-2_6/InterViews/world.h Tue Apr 2 13:52:45 1996 @@ -29,6 +29,10 @@ #ifndef iv_world_h #define iv_world_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-X11/Xext.h iv-3.1-g++2.7.2/iv/src/include/IV-X11/Xext.h --- iv-3.1/iv/src/include/IV-X11/Xext.h Thu Jan 24 21:55:52 1991 +++ iv-3.1-g++2.7.2/iv/src/include/IV-X11/Xext.h Tue Apr 2 13:52:45 1996 @@ -25,6 +25,10 @@ #ifndef IV_X11_Xext_h #define IV_X11_Xext_h +#ifdef __GNUG__ +#pragma interface +#endif + extern "C" { #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-X11/Xlib.h iv-3.1-g++2.7.2/iv/src/include/IV-X11/Xlib.h --- iv-3.1/iv/src/include/IV-X11/Xlib.h Thu Jan 24 21:55:54 1991 +++ iv-3.1-g++2.7.2/iv/src/include/IV-X11/Xlib.h Tue Apr 2 13:52:46 1996 @@ -31,6 +31,24 @@ extern "C" { +#ifdef AIXV3 +struct _XDisplay; +struct _XFreeFuncs; +struct _XSQEvent; +struct _XExten; +struct _XKeytrans; +struct _XDisplayAtoms; +struct _XContextDB; +struct _XIMFilter; +struct _XrmHashBucketRec; +#endif + +#ifdef __DECCXX +struct _XDisplay; +struct _XPrivate; +struct _XrmHashBucketRec; +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-X11/xbitmap.h iv-3.1-g++2.7.2/iv/src/include/IV-X11/xbitmap.h --- iv-3.1/iv/src/include/IV-X11/xbitmap.h Sat Jul 13 02:55:12 1991 +++ iv-3.1-g++2.7.2/iv/src/include/IV-X11/xbitmap.h Tue Apr 2 13:52:46 1996 @@ -25,6 +25,10 @@ #ifndef iv_xbitmap_h #define iv_xbitmap_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-X11/xbrush.h iv-3.1-g++2.7.2/iv/src/include/IV-X11/xbrush.h --- iv-3.1/iv/src/include/IV-X11/xbrush.h Sat Jul 13 02:55:13 1991 +++ iv-3.1-g++2.7.2/iv/src/include/IV-X11/xbrush.h Tue Apr 2 13:52:46 1996 @@ -25,10 +25,17 @@ #ifndef iv_xbrush_h #define iv_xbrush_h +#ifdef __GNUG__ +#pragma interface +#endif + class Display; class BrushRep { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif Display* display_; char* dash_list_; int dash_count_; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-X11/xcanvas.h iv-3.1-g++2.7.2/iv/src/include/IV-X11/xcanvas.h --- iv-3.1/iv/src/include/IV-X11/xcanvas.h Mon Jun 22 20:11:35 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-X11/xcanvas.h Tue Apr 2 13:52:46 1996 @@ -25,6 +25,10 @@ #ifndef iv_xcanvas_h #define iv_xcanvas_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include @@ -37,6 +41,9 @@ class CanvasDamage { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif Coord left; Coord bottom; Coord right; @@ -45,6 +52,9 @@ class TextRenderInfo { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif CanvasRep* canvas_; GC drawgc_; int x0_; @@ -60,6 +70,9 @@ class PathRenderInfo { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif Coord curx_; Coord cury_; XPoint* point_; @@ -69,6 +82,9 @@ class CanvasRep { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif Display* display_; Window* window_; XDrawable xdrawable_; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-X11/xcolor.h iv-3.1-g++2.7.2/iv/src/include/IV-X11/xcolor.h --- iv-3.1/iv/src/include/IV-X11/xcolor.h Thu Feb 27 23:47:56 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-X11/xcolor.h Tue Apr 2 13:52:46 1996 @@ -29,6 +29,10 @@ #ifndef iv_colorrep_h #define iv_colorrep_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include @@ -39,6 +43,9 @@ class ColorRep { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif WindowVisual* visual_; ColorOp op_; boolean masking_; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-X11/xcursor.h iv-3.1-g++2.7.2/iv/src/include/IV-X11/xcursor.h --- iv-3.1/iv/src/include/IV-X11/xcursor.h Mon Jun 8 08:36:49 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-X11/xcursor.h Tue Apr 2 13:52:46 1996 @@ -25,16 +25,24 @@ #ifndef iv_xcursor_h #define iv_xcursor_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include class Color; class Display; +class Style; class WindowVisual; class CursorRep { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif const Color* fg_; const Color* bg_; Display* display_; @@ -55,6 +63,9 @@ class CursorRepData : public CursorRep { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif short x_, y_; const int* pat_; const int* mask_; @@ -71,6 +82,9 @@ class CursorRepBitmap : public CursorRep { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif const Bitmap* pat_; const Bitmap* mask_; @@ -85,6 +99,9 @@ class CursorRepFont : public CursorRep { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif const Font* font_; int pat_; int mask_; @@ -99,6 +116,9 @@ class CursorRepXFont : public CursorRep { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif int code_; CursorRepXFont(int code, const Color* fg, const Color* bg); diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-X11/xdisplay.h iv-3.1-g++2.7.2/iv/src/include/IV-X11/xdisplay.h --- iv-3.1/iv/src/include/IV-X11/xdisplay.h Mon Jun 8 06:58:07 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-X11/xdisplay.h Tue Apr 2 13:52:46 1996 @@ -29,6 +29,10 @@ #ifndef iv_xdisplay_h #define iv_xdisplay_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-X11/xdrag.h iv-3.1-g++2.7.2/iv/src/include/IV-X11/xdrag.h --- iv-3.1/iv/src/include/IV-X11/xdrag.h Thu Sep 10 19:37:12 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-X11/xdrag.h Tue Apr 2 13:52:46 1996 @@ -24,6 +24,10 @@ #ifndef iv_xdrag_h #define iv_xdrag_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class XDrag { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-X11/xevent.h iv-3.1-g++2.7.2/iv/src/include/IV-X11/xevent.h --- iv-3.1/iv/src/include/IV-X11/xevent.h Mon Nov 4 21:12:30 1991 +++ iv-3.1-g++2.7.2/iv/src/include/IV-X11/xevent.h Tue Apr 2 13:52:46 1996 @@ -29,6 +29,10 @@ #ifndef iv_xevent_h #define iv_xevent_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-X11/xfont.h iv-3.1-g++2.7.2/iv/src/include/IV-X11/xfont.h --- iv-3.1/iv/src/include/IV-X11/xfont.h Thu Jul 25 18:44:05 1991 +++ iv-3.1-g++2.7.2/iv/src/include/IV-X11/xfont.h Tue Apr 2 13:52:47 1996 @@ -29,6 +29,10 @@ #ifndef iv_xfont_h #define iv_xfont_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include @@ -56,6 +60,9 @@ class FontFamilyRep { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif Display* display_; int count_; int min_weight_; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-X11/xpainter.h iv-3.1-g++2.7.2/iv/src/include/IV-X11/xpainter.h --- iv-3.1/iv/src/include/IV-X11/xpainter.h Fri Aug 16 21:23:38 1991 +++ iv-3.1-g++2.7.2/iv/src/include/IV-X11/xpainter.h Tue Apr 2 13:52:47 1996 @@ -29,6 +29,10 @@ #ifndef iv_xpainter_h #define iv_xpainter_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Brush; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-X11/xpattern.h iv-3.1-g++2.7.2/iv/src/include/IV-X11/xpattern.h --- iv-3.1/iv/src/include/IV-X11/xpattern.h Sat Jul 13 02:55:25 1991 +++ iv-3.1-g++2.7.2/iv/src/include/IV-X11/xpattern.h Tue Apr 2 13:52:47 1996 @@ -25,6 +25,10 @@ #ifndef iv_xpattern_h #define iv_xpattern_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include @@ -33,6 +37,9 @@ class PatternRep { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif Display* display_; Pixmap pixmap_; }; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-X11/xraster.h iv-3.1-g++2.7.2/iv/src/include/IV-X11/xraster.h --- iv-3.1/iv/src/include/IV-X11/xraster.h Mon Jul 29 09:00:13 1991 +++ iv-3.1-g++2.7.2/iv/src/include/IV-X11/xraster.h Tue Apr 2 13:52:47 1996 @@ -29,6 +29,10 @@ #ifndef iv_xraster_h #define iv_xraster_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include @@ -38,6 +42,9 @@ class RasterRep { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif Display* display_; boolean modified_; Coord left_; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-X11/xselection.h iv-3.1-g++2.7.2/iv/src/include/IV-X11/xselection.h --- iv-3.1/iv/src/include/IV-X11/xselection.h Mon May 11 19:17:27 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-X11/xselection.h Tue Apr 2 13:52:47 1996 @@ -25,6 +25,10 @@ #ifndef iv_xselection_h #define iv_xselection_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include @@ -32,6 +36,9 @@ class SelectionManagerRep { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif XDisplay* xdisplay_; String* name_; XSelectionRequestEvent x_req_; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-X11/xwindow.h iv-3.1-g++2.7.2/iv/src/include/IV-X11/xwindow.h --- iv-3.1/iv/src/include/IV-X11/xwindow.h Fri Sep 25 00:16:22 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-X11/xwindow.h Tue Apr 2 13:52:47 1996 @@ -25,6 +25,10 @@ #ifndef iv_xwindow_h #define iv_xwindow_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include @@ -46,7 +50,6 @@ class Style; class WindowCursorStack; class WindowTable; -class XDisplay; struct WindowOverlayInfo { VisualID id_; @@ -66,6 +69,9 @@ class WindowVisual { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif WindowVisual(const WindowVisualInfo&); ~WindowVisual(); @@ -127,6 +133,9 @@ class WindowRep { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif Glyph* glyph_; Style* style_; Display* display_; @@ -190,6 +199,9 @@ class ManagedWindowHintInfo { private: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif friend class ManagedWindowRep; Style* style_; @@ -205,6 +217,9 @@ class ManagedWindowRep { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif ManagedWindow* icon_; Bitmap* icon_bitmap_; Bitmap* icon_mask_; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-look/bevel.h iv-3.1-g++2.7.2/iv/src/include/IV-look/bevel.h --- iv-3.1/iv/src/include/IV-look/bevel.h Thu May 14 19:46:15 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-look/bevel.h Tue Apr 2 13:52:47 1996 @@ -29,6 +29,10 @@ #ifndef ivlook_bevel_h #define ivlook_bevel_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class BevelFrame : public MonoGlyph { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-look/browser.h iv-3.1-g++2.7.2/iv/src/include/IV-look/browser.h --- iv-3.1/iv/src/include/IV-look/browser.h Wed Jul 29 23:39:47 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-look/browser.h Tue Apr 2 13:52:47 1996 @@ -29,6 +29,10 @@ #ifndef ivlook_browser_h #define ivlook_browser_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-look/button.h iv-3.1-g++2.7.2/iv/src/include/IV-look/button.h --- iv-3.1/iv/src/include/IV-look/button.h Thu Jun 25 23:41:59 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-look/button.h Tue Apr 2 13:52:47 1996 @@ -29,6 +29,10 @@ #ifndef ivlook_button_h #define ivlook_button_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-look/choice.h iv-3.1-g++2.7.2/iv/src/include/IV-look/choice.h --- iv-3.1/iv/src/include/IV-look/choice.h Mon Mar 16 23:48:50 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-look/choice.h Tue Apr 2 13:52:48 1996 @@ -25,6 +25,10 @@ #ifndef ivlook_choice_h #define ivlook_choice_h +#ifdef __GNUG__ +#pragma interface +#endif + /* * ChoiceItem - telltale with different look for each state */ diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-look/dialogs.h iv-3.1-g++2.7.2/iv/src/include/IV-look/dialogs.h --- iv-3.1/iv/src/include/IV-look/dialogs.h Thu May 28 23:20:44 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-look/dialogs.h Tue Apr 2 13:52:48 1996 @@ -29,6 +29,10 @@ #ifndef ivlook_dialogs_h #define ivlook_dialogs_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-look/fbrowser.h iv-3.1-g++2.7.2/iv/src/include/IV-look/fbrowser.h --- iv-3.1/iv/src/include/IV-look/fbrowser.h Wed Jul 29 23:39:48 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-look/fbrowser.h Tue Apr 2 13:52:48 1996 @@ -29,6 +29,10 @@ #ifndef ivlook_fbrowser_h #define ivlook_fbrowser_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Adjustable; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-look/fchooser.h iv-3.1-g++2.7.2/iv/src/include/IV-look/fchooser.h --- iv-3.1/iv/src/include/IV-look/fchooser.h Wed Jul 1 00:05:02 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-look/fchooser.h Tue Apr 2 13:52:48 1996 @@ -29,6 +29,10 @@ #ifndef ivlook_fchooser_h #define ivlook_fchooser_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-look/field.h iv-3.1-g++2.7.2/iv/src/include/IV-look/field.h --- iv-3.1/iv/src/include/IV-look/field.h Wed Jul 29 23:39:49 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-look/field.h Tue Apr 2 13:52:48 1996 @@ -29,6 +29,10 @@ #ifndef ivlook_field_h #define ivlook_field_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-look/kit.h iv-3.1-g++2.7.2/iv/src/include/IV-look/kit.h --- iv-3.1/iv/src/include/IV-look/kit.h Thu Jun 11 17:42:26 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-look/kit.h Tue Apr 2 13:52:48 1996 @@ -29,6 +29,10 @@ #ifndef ivlook_kit_h #define ivlook_kit_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-look/menu.h iv-3.1-g++2.7.2/iv/src/include/IV-look/menu.h --- iv-3.1/iv/src/include/IV-look/menu.h Mon Jun 8 08:42:47 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-look/menu.h Tue Apr 2 13:52:48 1996 @@ -29,6 +29,10 @@ #ifndef ivlook_menu_h #define ivlook_menu_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-look/mf_dialogs.h iv-3.1-g++2.7.2/iv/src/include/IV-look/mf_dialogs.h --- iv-3.1/iv/src/include/IV-look/mf_dialogs.h Thu May 28 23:20:46 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-look/mf_dialogs.h Tue Apr 2 13:52:48 1996 @@ -29,6 +29,10 @@ #ifndef ivlook_mf_dialogs_h #define ivlook_mf_dialogs_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class String; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-look/mf_kit.h iv-3.1-g++2.7.2/iv/src/include/IV-look/mf_kit.h --- iv-3.1/iv/src/include/IV-look/mf_kit.h Wed Apr 8 17:49:57 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-look/mf_kit.h Tue Apr 2 13:52:49 1996 @@ -29,6 +29,10 @@ #ifndef ivlook_mfkit_h #define ivlook_mfkit_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class MFKitImpl; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-look/mono_kit.h iv-3.1-g++2.7.2/iv/src/include/IV-look/mono_kit.h --- iv-3.1/iv/src/include/IV-look/mono_kit.h Thu Jul 2 19:11:16 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-look/mono_kit.h Tue Apr 2 13:52:49 1996 @@ -29,6 +29,10 @@ #ifndef ivlook_mono_mf_kit_h #define ivlook_mono_mf_kit_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class MonoKitImpl; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-look/ol_dialogs.h iv-3.1-g++2.7.2/iv/src/include/IV-look/ol_dialogs.h --- iv-3.1/iv/src/include/IV-look/ol_dialogs.h Fri Sep 18 18:38:23 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-look/ol_dialogs.h Tue Apr 2 13:52:49 1996 @@ -29,6 +29,10 @@ #ifndef ivlook_ol_dialogs_h #define ivlook_ol_dialogs_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class String; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-look/ol_kit.h iv-3.1-g++2.7.2/iv/src/include/IV-look/ol_kit.h --- iv-3.1/iv/src/include/IV-look/ol_kit.h Mon Oct 26 23:31:26 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-look/ol_kit.h Tue Apr 2 13:52:49 1996 @@ -25,6 +25,10 @@ #ifndef ivlook_olkit_h #define ivlook_olkit_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class OLKitImpl; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-look/slider.h iv-3.1-g++2.7.2/iv/src/include/IV-look/slider.h --- iv-3.1/iv/src/include/IV-look/slider.h Mon Jul 13 19:08:23 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-look/slider.h Tue Apr 2 13:52:49 1996 @@ -29,6 +29,10 @@ #ifndef ivlook_slider_h #define ivlook_slider_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-look/smf_kit.h iv-3.1-g++2.7.2/iv/src/include/IV-look/smf_kit.h --- iv-3.1/iv/src/include/IV-look/smf_kit.h Thu Jun 11 17:30:29 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-look/smf_kit.h Tue Apr 2 13:52:49 1996 @@ -29,6 +29,10 @@ #ifndef ivlook_smfkit_h #define ivlook_smfkit_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class SMFKitImpl; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/IV-look/stepper.h iv-3.1-g++2.7.2/iv/src/include/IV-look/stepper.h --- iv-3.1/iv/src/include/IV-look/stepper.h Mon Jun 29 20:23:19 1992 +++ iv-3.1-g++2.7.2/iv/src/include/IV-look/stepper.h Tue Apr 2 13:52:49 1996 @@ -29,6 +29,10 @@ #ifndef ivlook_stepper_h #define ivlook_stepper_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/action.h iv-3.1-g++2.7.2/iv/src/include/InterViews/action.h --- iv-3.1/iv/src/include/InterViews/action.h Mon Jun 1 23:07:00 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/action.h Tue Apr 2 13:52:49 1996 @@ -29,6 +29,10 @@ #ifndef iv_action_h #define iv_action_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/adjust.h iv-3.1-g++2.7.2/iv/src/include/InterViews/adjust.h --- iv-3.1/iv/src/include/InterViews/adjust.h Tue Jun 30 22:25:20 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/adjust.h Tue Apr 2 13:52:49 1996 @@ -29,6 +29,10 @@ #ifndef iv_adjust_h #define iv_adjust_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/aggr.h iv-3.1-g++2.7.2/iv/src/include/InterViews/aggr.h --- iv-3.1/iv/src/include/InterViews/aggr.h Mon Jul 29 23:08:45 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/aggr.h Tue Apr 2 13:52:50 1996 @@ -29,6 +29,10 @@ #ifndef iv_aggr_h #define iv_aggr_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/align.h iv-3.1-g++2.7.2/iv/src/include/InterViews/align.h --- iv-3.1/iv/src/include/InterViews/align.h Fri May 3 02:04:53 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/align.h Tue Apr 2 13:52:50 1996 @@ -29,6 +29,10 @@ #ifndef iv_align_h #define iv_align_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/alloctbl.h iv-3.1-g++2.7.2/iv/src/include/InterViews/alloctbl.h --- iv-3.1/iv/src/include/InterViews/alloctbl.h Fri Apr 10 23:45:20 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/alloctbl.h Tue Apr 2 13:52:50 1996 @@ -29,6 +29,10 @@ #ifndef iv_alloctbl_h #define iv_alloctbl_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include @@ -37,6 +41,9 @@ class AllocationInfo { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif Canvas* canvas() const; const Allocation& allocation() const; const Transformer& transformer() const; @@ -48,7 +55,7 @@ friend class AllocationTable; Canvas* canvas_; - Transformer transformer_; + Transformer* transformer_; Allocation allocation_; Extension extension_; long num_components_; @@ -62,7 +69,7 @@ } inline const Transformer& AllocationInfo::transformer() const { - return transformer_; + return *transformer_; } inline void AllocationInfo::extension(const Extension& e) { extension_ = e; } diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/arraycomp.h iv-3.1-g++2.7.2/iv/src/include/InterViews/arraycomp.h --- iv-3.1/iv/src/include/InterViews/arraycomp.h Fri May 3 02:04:54 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/arraycomp.h Tue Apr 2 13:52:50 1996 @@ -29,6 +29,10 @@ #ifndef iv_arraycomp_h #define iv_arraycomp_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/background.h iv-3.1-g++2.7.2/iv/src/include/InterViews/background.h --- iv-3.1/iv/src/include/InterViews/background.h Fri May 3 02:04:56 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/background.h Tue Apr 2 13:52:50 1996 @@ -29,6 +29,10 @@ #ifndef iv_background_h #define iv_background_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/bitmap.h iv-3.1-g++2.7.2/iv/src/include/InterViews/bitmap.h --- iv-3.1/iv/src/include/InterViews/bitmap.h Wed Feb 12 00:22:48 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/bitmap.h Tue Apr 2 13:52:50 1996 @@ -29,6 +29,10 @@ #ifndef iv_bitmap_h #define iv_bitmap_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/border.h iv-3.1-g++2.7.2/iv/src/include/InterViews/border.h --- iv-3.1/iv/src/include/InterViews/border.h Fri May 3 02:04:59 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/border.h Tue Apr 2 13:52:50 1996 @@ -29,6 +29,10 @@ #ifndef ivlook_border_h #define ivlook_border_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Color; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/box.h iv-3.1-g++2.7.2/iv/src/include/InterViews/box.h --- iv-3.1/iv/src/include/InterViews/box.h Mon Apr 13 18:59:03 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/box.h Tue Apr 2 13:52:50 1996 @@ -29,6 +29,10 @@ #ifndef iv_box_h #define iv_box_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/brush.h iv-3.1-g++2.7.2/iv/src/include/InterViews/brush.h --- iv-3.1/iv/src/include/InterViews/brush.h Tue Feb 11 18:33:37 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/brush.h Tue Apr 2 13:52:51 1996 @@ -29,6 +29,10 @@ #ifndef iv_brush_h #define iv_brush_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/canvas.h iv-3.1-g++2.7.2/iv/src/include/InterViews/canvas.h --- iv-3.1/iv/src/include/InterViews/canvas.h Mon Sep 14 23:48:30 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/canvas.h Tue Apr 2 13:52:51 1996 @@ -29,6 +29,10 @@ #ifndef iv_canvas_h #define iv_canvas_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/character.h iv-3.1-g++2.7.2/iv/src/include/InterViews/character.h --- iv-3.1/iv/src/include/InterViews/character.h Mon Jul 29 23:08:48 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/character.h Tue Apr 2 13:52:51 1996 @@ -29,6 +29,10 @@ #ifndef iv_character_h #define iv_character_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Color; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/color.h iv-3.1-g++2.7.2/iv/src/include/InterViews/color.h --- iv-3.1/iv/src/include/InterViews/color.h Thu Feb 27 02:18:27 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/color.h Tue Apr 2 13:52:51 1996 @@ -25,6 +25,10 @@ #ifndef iv_color_h #define iv_color_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include @@ -66,6 +70,7 @@ Display*, ColorIntensity& r, ColorIntensity& g, ColorIntensity& b ) const; virtual float alpha() const; + virtual ColorOp op() const; virtual const Color* brightness(float adjust) const; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/composition.h iv-3.1-g++2.7.2/iv/src/include/InterViews/composition.h --- iv-3.1/iv/src/include/InterViews/composition.h Fri Oct 25 17:35:52 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/composition.h Tue Apr 2 13:52:51 1996 @@ -25,6 +25,10 @@ #ifndef iv_composition_h #define iv_composition_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class CompositionComponent_List; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/compositor.h iv-3.1-g++2.7.2/iv/src/include/InterViews/compositor.h --- iv-3.1/iv/src/include/InterViews/compositor.h Fri May 3 02:05:11 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/compositor.h Tue Apr 2 13:52:51 1996 @@ -29,6 +29,10 @@ #ifndef iv_compositor_h #define iv_compositor_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/coord.h iv-3.1-g++2.7.2/iv/src/include/InterViews/coord.h --- iv-3.1/iv/src/include/InterViews/coord.h Fri Apr 10 20:27:32 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/coord.h Tue Apr 2 13:52:51 1996 @@ -29,6 +29,10 @@ #ifndef iv_coord_h #define iv_coord_h +#ifdef __GNUG__ +#pragma interface +#endif + #include typedef float _lib_iv(Coord); diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/cursor.h iv-3.1-g++2.7.2/iv/src/include/InterViews/cursor.h --- iv-3.1/iv/src/include/InterViews/cursor.h Sat Jul 13 02:53:48 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/cursor.h Tue Apr 2 13:52:51 1996 @@ -32,6 +32,10 @@ #ifndef iv_cursor_h #define iv_cursor_h +#ifdef __GNUG__ +#pragma interface +#endif + #include static const int cursorHeight = 16; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/debug.h iv-3.1-g++2.7.2/iv/src/include/InterViews/debug.h --- iv-3.1/iv/src/include/InterViews/debug.h Mon Sep 14 20:09:14 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/debug.h Tue Apr 2 13:52:52 1996 @@ -29,6 +29,10 @@ #ifndef iv_debug_h #define iv_debug_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/deck.h iv-3.1-g++2.7.2/iv/src/include/InterViews/deck.h --- iv-3.1/iv/src/include/InterViews/deck.h Mon Apr 13 18:59:04 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/deck.h Tue Apr 2 13:52:52 1996 @@ -25,6 +25,10 @@ #ifndef iv_deck_h #define iv_deck_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/dialog.h iv-3.1-g++2.7.2/iv/src/include/InterViews/dialog.h --- iv-3.1/iv/src/include/InterViews/dialog.h Wed Oct 28 18:48:32 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/dialog.h Tue Apr 2 13:52:52 1996 @@ -29,6 +29,10 @@ #ifndef iv_dialog_h #define iv_dialog_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/display.h iv-3.1-g++2.7.2/iv/src/include/InterViews/display.h --- iv-3.1/iv/src/include/InterViews/display.h Mon Sep 14 23:32:59 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/display.h Tue Apr 2 13:52:52 1996 @@ -29,6 +29,10 @@ #ifndef iv_display_h #define iv_display_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/drag.h iv-3.1-g++2.7.2/iv/src/include/InterViews/drag.h --- iv-3.1/iv/src/include/InterViews/drag.h Thu Sep 10 19:36:24 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/drag.h Tue Apr 2 13:52:52 1996 @@ -24,6 +24,10 @@ #ifndef iv_drag_h #define iv_drag_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/enter-scope.h iv-3.1-g++2.7.2/iv/src/include/InterViews/enter-scope.h --- iv-3.1/iv/src/include/InterViews/enter-scope.h Sat Oct 31 00:43:17 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/enter-scope.h Tue Apr 2 13:52:52 1996 @@ -36,7 +36,7 @@ #include #endif -#ifndef os__scope_h +#ifndef iv_os__scope_h /* * Use OS boolean and String definitions. diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/event.h iv-3.1-g++2.7.2/iv/src/include/InterViews/event.h --- iv-3.1/iv/src/include/InterViews/event.h Mon Jul 13 18:51:55 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/event.h Tue Apr 2 13:52:52 1996 @@ -29,6 +29,10 @@ #ifndef iv_event_h #define iv_event_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/font.h iv-3.1-g++2.7.2/iv/src/include/InterViews/font.h --- iv-3.1/iv/src/include/InterViews/font.h Thu Jun 4 01:42:16 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/font.h Tue Apr 2 13:52:52 1996 @@ -30,6 +30,10 @@ #ifndef iv_font_h #define iv_font_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include @@ -66,6 +70,9 @@ class FontBoundingBox { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif Coord left_bearing() const; Coord right_bearing() const; Coord width() const; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/geometry.h iv-3.1-g++2.7.2/iv/src/include/InterViews/geometry.h --- iv-3.1/iv/src/include/InterViews/geometry.h Fri Jun 5 00:40:45 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/geometry.h Tue Apr 2 13:52:52 1996 @@ -25,6 +25,10 @@ #ifndef iv_geometry_h #define iv_geometry_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include @@ -44,6 +48,9 @@ class CoordinateSpace { public: enum { x = 0, y, z, dimensions }; +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif }; class Requirement { @@ -75,6 +82,9 @@ Coord stretch_; Coord shrink_; float alignment_; +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif }; class Requisition { @@ -100,6 +110,9 @@ int penalty_; Requirement x_; Requirement y_; +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif }; class Allotment { @@ -124,6 +137,9 @@ Coord origin_; Coord span_; float alignment_; +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif }; class Allocation { @@ -152,6 +168,9 @@ private: Allotment x_; Allotment y_; +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif }; class Canvas; @@ -184,6 +203,9 @@ Coord x_end_; Coord y_begin_; Coord y_end_; +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif }; inline Requirement::Requirement() { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/glcontext.h iv-3.1-g++2.7.2/iv/src/include/InterViews/glcontext.h --- iv-3.1/iv/src/include/InterViews/glcontext.h Sat Jan 11 01:08:52 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/glcontext.h Tue Apr 2 13:52:53 1996 @@ -29,6 +29,10 @@ #ifndef iv_glcontext_h #define iv_glcontext_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/glue.h iv-3.1-g++2.7.2/iv/src/include/InterViews/glue.h --- iv-3.1/iv/src/include/InterViews/glue.h Fri Jan 31 02:22:23 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/glue.h Tue Apr 2 13:52:53 1996 @@ -29,6 +29,10 @@ #ifndef iv_glue_h #define iv_glue_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/glyph.h iv-3.1-g++2.7.2/iv/src/include/InterViews/glyph.h --- iv-3.1/iv/src/include/InterViews/glyph.h Mon Apr 13 18:59:05 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/glyph.h Tue Apr 2 13:52:53 1996 @@ -29,6 +29,10 @@ #ifndef iv_glyph_h #define iv_glyph_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include @@ -42,7 +46,7 @@ typedef long GlyphIndex; typedef unsigned int GlyphBreakType; -class Glyph : public Resource { +class Glyph : virtual public Resource { public: enum { no_break, pre_break, in_break, post_break }; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/group.h iv-3.1-g++2.7.2/iv/src/include/InterViews/group.h --- iv-3.1/iv/src/include/InterViews/group.h Fri May 3 02:05:28 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/group.h Tue Apr 2 13:52:53 1996 @@ -25,6 +25,10 @@ #ifndef iv_group_h #define iv_group_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Aggregate; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/handler.h iv-3.1-g++2.7.2/iv/src/include/InterViews/handler.h --- iv-3.1/iv/src/include/InterViews/handler.h Tue Feb 11 18:33:42 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/handler.h Tue Apr 2 13:52:53 1996 @@ -25,13 +25,17 @@ #ifndef iv_handler_h #define iv_handler_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include class Event; -class Handler : public Resource { +class Handler : virtual public Resource { protected: Handler(); virtual ~Handler(); diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/hit.h iv-3.1-g++2.7.2/iv/src/include/InterViews/hit.h --- iv-3.1/iv/src/include/InterViews/hit.h Wed Feb 19 07:44:44 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/hit.h Tue Apr 2 13:52:53 1996 @@ -29,6 +29,10 @@ #ifndef iv_hit_h #define iv_hit_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/image.h iv-3.1-g++2.7.2/iv/src/include/InterViews/image.h --- iv-3.1/iv/src/include/InterViews/image.h Fri May 3 02:05:33 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/image.h Tue Apr 2 13:52:53 1996 @@ -29,6 +29,10 @@ #ifndef iv_image_h #define iv_image_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Raster; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/input.h iv-3.1-g++2.7.2/iv/src/include/InterViews/input.h --- iv-3.1/iv/src/include/InterViews/input.h Mon Jul 20 23:19:52 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/input.h Tue Apr 2 13:52:53 1996 @@ -29,6 +29,10 @@ #ifndef iv_input_h #define iv_input_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Event; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/iv.h iv-3.1-g++2.7.2/iv/src/include/InterViews/iv.h --- iv-3.1/iv/src/include/InterViews/iv.h Sat Jul 27 05:51:18 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/iv.h Tue Apr 2 13:52:53 1996 @@ -25,6 +25,10 @@ #ifndef _lib_iv_h #define _lib_iv_h +#ifdef __GNUG__ +#pragma interface +#endif + #if defined(__STDC__) || defined(__ANSI_CPP__) #define _lib_iv(name) iv##name #define _lib_iv2_6(name) iv2_6_##name diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/label.h iv-3.1-g++2.7.2/iv/src/include/InterViews/label.h --- iv-3.1/iv/src/include/InterViews/label.h Mon Nov 4 21:26:50 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/label.h Tue Apr 2 13:52:54 1996 @@ -29,6 +29,10 @@ #ifndef iv_label_h #define iv_label_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/layout.h iv-3.1-g++2.7.2/iv/src/include/InterViews/layout.h --- iv-3.1/iv/src/include/InterViews/layout.h Fri Sep 4 18:07:29 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/layout.h Tue Apr 2 13:52:54 1996 @@ -29,6 +29,10 @@ #ifndef iv_layout_h #define iv_layout_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/lrmarker.h iv-3.1-g++2.7.2/iv/src/include/InterViews/lrmarker.h --- iv-3.1/iv/src/include/InterViews/lrmarker.h Thu Jun 18 01:17:34 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/lrmarker.h Tue Apr 2 13:52:54 1996 @@ -29,6 +29,10 @@ #ifndef iv_lrmarker_h #define iv_lrmarker_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Color; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/monoglyph.h iv-3.1-g++2.7.2/iv/src/include/InterViews/monoglyph.h --- iv-3.1/iv/src/include/InterViews/monoglyph.h Mon Apr 13 18:59:08 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/monoglyph.h Tue Apr 2 13:52:54 1996 @@ -29,6 +29,10 @@ #ifndef iv_monoglyph_h #define iv_monoglyph_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/observe.h iv-3.1-g++2.7.2/iv/src/include/InterViews/observe.h --- iv-3.1/iv/src/include/InterViews/observe.h Mon Mar 16 18:04:57 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/observe.h Tue Apr 2 13:52:54 1996 @@ -29,6 +29,10 @@ #ifndef iv_observe_h #define iv_observe_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/page.h iv-3.1-g++2.7.2/iv/src/include/InterViews/page.h --- iv-3.1/iv/src/include/InterViews/page.h Thu Jun 18 02:33:41 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/page.h Tue Apr 2 13:52:54 1996 @@ -29,6 +29,10 @@ #ifndef iv_page_h #define iv_page_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class PageInfo_List; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/patch.h iv-3.1-g++2.7.2/iv/src/include/InterViews/patch.h --- iv-3.1/iv/src/include/InterViews/patch.h Mon Apr 13 18:59:09 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/patch.h Tue Apr 2 13:52:54 1996 @@ -29,6 +29,10 @@ #ifndef iv_patch_h #define iv_patch_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/pattern.h iv-3.1-g++2.7.2/iv/src/include/InterViews/pattern.h --- iv-3.1/iv/src/include/InterViews/pattern.h Tue Feb 11 18:33:43 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/pattern.h Tue Apr 2 13:52:54 1996 @@ -29,6 +29,10 @@ #ifndef iv_pattern_h #define iv_pattern_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/place.h iv-3.1-g++2.7.2/iv/src/include/InterViews/place.h --- iv-3.1/iv/src/include/InterViews/place.h Wed Jul 29 23:43:14 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/place.h Tue Apr 2 13:52:54 1996 @@ -29,6 +29,10 @@ #ifndef iv_place_h #define iv_place_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/polyglyph.h iv-3.1-g++2.7.2/iv/src/include/InterViews/polyglyph.h --- iv-3.1/iv/src/include/InterViews/polyglyph.h Mon Apr 13 18:59:11 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/polyglyph.h Tue Apr 2 13:52:55 1996 @@ -29,6 +29,10 @@ #ifndef iv_polyglyph_h #define iv_polyglyph_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/printer.h iv-3.1-g++2.7.2/iv/src/include/InterViews/printer.h --- iv-3.1/iv/src/include/InterViews/printer.h Wed May 13 02:18:50 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/printer.h Tue Apr 2 13:52:55 1996 @@ -29,6 +29,10 @@ #ifndef iv_printer_h #define iv_printer_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class ostream; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/psfont.h iv-3.1-g++2.7.2/iv/src/include/InterViews/psfont.h --- iv-3.1/iv/src/include/InterViews/psfont.h Tue Jan 21 23:12:20 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/psfont.h Tue Apr 2 13:52:55 1996 @@ -29,6 +29,10 @@ #ifndef iv_psfont_h #define iv_psfont_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/raster.h iv-3.1-g++2.7.2/iv/src/include/InterViews/raster.h --- iv-3.1/iv/src/include/InterViews/raster.h Tue Feb 11 18:33:44 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/raster.h Tue Apr 2 13:52:55 1996 @@ -29,6 +29,10 @@ #ifndef iv_raster_h #define iv_raster_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/regexp.h iv-3.1-g++2.7.2/iv/src/include/InterViews/regexp.h --- iv-3.1/iv/src/include/InterViews/regexp.h Thu May 2 01:31:00 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/regexp.h Tue Apr 2 13:52:55 1996 @@ -29,6 +29,10 @@ #ifndef iv_regexp_h #define iv_regexp_h +#ifdef __GNUG__ +#pragma interface +#endif + #include /* @@ -64,12 +68,13 @@ Regexp(const char*, int length); ~Regexp(); + const char* pattern() const; int Search(const char* text, int length, int index, int range); int Match(const char* text, int length, int index); int BeginningOfMatch(int subexp = 0); int EndOfMatch(int subexp = 0); private: - char* pattern; + char* pattern_; regexp* c_pattern; }; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/reqerr.h iv-3.1-g++2.7.2/iv/src/include/InterViews/reqerr.h --- iv-3.1/iv/src/include/InterViews/reqerr.h Wed Sep 25 21:52:36 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/reqerr.h Tue Apr 2 13:52:55 1996 @@ -29,6 +29,10 @@ #ifndef iv_reqerr_h #define iv_reqerr_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/resource.h iv-3.1-g++2.7.2/iv/src/include/InterViews/resource.h --- iv-3.1/iv/src/include/InterViews/resource.h Thu Jun 4 01:42:06 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/resource.h Tue Apr 2 13:52:55 1996 @@ -29,6 +29,10 @@ #ifndef iv_resource_h #define iv_resource_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Resource { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/rule.h iv-3.1-g++2.7.2/iv/src/include/InterViews/rule.h --- iv-3.1/iv/src/include/InterViews/rule.h Fri May 3 02:06:12 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/rule.h Tue Apr 2 13:52:55 1996 @@ -29,6 +29,10 @@ #ifndef ivlook_rule_h #define ivlook_rule_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Color; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/scrbox.h iv-3.1-g++2.7.2/iv/src/include/InterViews/scrbox.h --- iv-3.1/iv/src/include/InterViews/scrbox.h Mon Apr 13 18:59:12 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/scrbox.h Tue Apr 2 13:52:55 1996 @@ -29,6 +29,10 @@ #ifndef iv_scrbox_h #define iv_scrbox_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/selection.h iv-3.1-g++2.7.2/iv/src/include/InterViews/selection.h --- iv-3.1/iv/src/include/InterViews/selection.h Mon May 11 19:12:38 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/selection.h Tue Apr 2 13:52:56 1996 @@ -25,6 +25,10 @@ #ifndef iv_selection_h #define iv_selection_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/session.h iv-3.1-g++2.7.2/iv/src/include/InterViews/session.h --- iv-3.1/iv/src/include/InterViews/session.h Tue Jan 21 23:12:23 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/session.h Tue Apr 2 13:52:56 1996 @@ -29,6 +29,10 @@ #ifndef iv_session_h #define iv_session_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include @@ -45,6 +49,9 @@ public: const char* path; /* class/instance(s) property name */ const char* value; /* property value */ +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif }; enum OptionStyle { @@ -61,6 +68,9 @@ const char* path; OptionStyle style; const char* value; +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif }; class Session { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/shadow.h iv-3.1-g++2.7.2/iv/src/include/InterViews/shadow.h --- iv-3.1/iv/src/include/InterViews/shadow.h Wed Apr 1 18:32:55 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/shadow.h Tue Apr 2 13:52:56 1996 @@ -29,6 +29,10 @@ #ifndef iv_shadow_h #define iv_shadow_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Color; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/simplecomp.h iv-3.1-g++2.7.2/iv/src/include/InterViews/simplecomp.h --- iv-3.1/iv/src/include/InterViews/simplecomp.h Fri May 3 02:06:18 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/simplecomp.h Tue Apr 2 13:52:56 1996 @@ -25,6 +25,10 @@ #ifndef iv_simplecomp_h #define iv_simplecomp_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class SimpleCompositor : public Compositor { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/stencil.h iv-3.1-g++2.7.2/iv/src/include/InterViews/stencil.h --- iv-3.1/iv/src/include/InterViews/stencil.h Fri May 3 02:06:21 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/stencil.h Tue Apr 2 13:52:56 1996 @@ -29,6 +29,10 @@ #ifndef iv_stencil_h #define iv_stencil_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Bitmap; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/style.h iv-3.1-g++2.7.2/iv/src/include/InterViews/style.h --- iv-3.1/iv/src/include/InterViews/style.h Fri Sep 4 23:13:29 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/style.h Tue Apr 2 13:52:56 1996 @@ -29,6 +29,10 @@ #ifndef iv_style_h #define iv_style_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/superpose.h iv-3.1-g++2.7.2/iv/src/include/InterViews/superpose.h --- iv-3.1/iv/src/include/InterViews/superpose.h Fri May 3 02:06:24 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/superpose.h Tue Apr 2 13:52:56 1996 @@ -29,6 +29,10 @@ #ifndef iv_superpose_h #define iv_superpose_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Superpose : public Layout { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/target.h iv-3.1-g++2.7.2/iv/src/include/InterViews/target.h --- iv-3.1/iv/src/include/InterViews/target.h Mon Jul 29 23:09:04 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/target.h Tue Apr 2 13:52:56 1996 @@ -29,6 +29,10 @@ #ifndef iv_target_h #define iv_target_h +#ifdef __GNUG__ +#pragma interface +#endif + #include enum TargetSensitivity { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/telltale.h iv-3.1-g++2.7.2/iv/src/include/InterViews/telltale.h --- iv-3.1/iv/src/include/InterViews/telltale.h Mon Mar 16 23:35:51 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/telltale.h Tue Apr 2 13:52:56 1996 @@ -29,6 +29,10 @@ #ifndef ivlook_telltale_h #define ivlook_telltale_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include @@ -64,6 +68,7 @@ }; TelltaleFlags flags() const; + TelltaleGroup* group() const; virtual void set(const TelltaleFlags, boolean); virtual boolean test(const TelltaleFlags) const; @@ -75,6 +80,7 @@ }; inline TelltaleFlags TelltaleState::flags() const { return flags_; } +inline TelltaleGroup* TelltaleState::group() const { return group_; } class Telltale : public MonoGlyph, public Observer { protected: diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/texcomp.h iv-3.1-g++2.7.2/iv/src/include/InterViews/texcomp.h --- iv-3.1/iv/src/include/InterViews/texcomp.h Fri May 3 02:06:28 1991 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/texcomp.h Tue Apr 2 13:52:57 1996 @@ -25,6 +25,10 @@ #ifndef iv_texcomp_h #define iv_texcomp_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class TeXCompositor : public Compositor { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/tformsetter.h iv-3.1-g++2.7.2/iv/src/include/InterViews/tformsetter.h --- iv-3.1/iv/src/include/InterViews/tformsetter.h Tue Feb 4 17:45:18 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/tformsetter.h Tue Apr 2 13:52:57 1996 @@ -25,6 +25,10 @@ #ifndef iv_tformsetter_h #define iv_tformsetter_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/tiff.h iv-3.1-g++2.7.2/iv/src/include/InterViews/tiff.h --- iv-3.1/iv/src/include/InterViews/tiff.h Tue Jan 21 23:12:25 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/tiff.h Tue Apr 2 13:52:57 1996 @@ -29,6 +29,10 @@ #ifndef iv_tiff_h #define iv_tiff_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/tile.h iv-3.1-g++2.7.2/iv/src/include/InterViews/tile.h --- iv-3.1/iv/src/include/InterViews/tile.h Wed Mar 25 02:48:19 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/tile.h Tue Apr 2 13:52:57 1996 @@ -29,6 +29,10 @@ #ifndef iv_tile_h #define iv_tile_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Tile : public Layout { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/transformer.h iv-3.1-g++2.7.2/iv/src/include/InterViews/transformer.h --- iv-3.1/iv/src/include/InterViews/transformer.h Wed Sep 16 00:35:48 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/transformer.h Tue Apr 2 13:52:57 1996 @@ -29,6 +29,10 @@ #ifndef iv_transformer_h #define iv_transformer_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/window.h iv-3.1-g++2.7.2/iv/src/include/InterViews/window.h --- iv-3.1/iv/src/include/InterViews/window.h Fri Jun 26 00:11:21 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/window.h Tue Apr 2 13:52:57 1996 @@ -29,6 +29,10 @@ #ifndef iv_window_h #define iv_window_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/InterViews/xymarker.h iv-3.1-g++2.7.2/iv/src/include/InterViews/xymarker.h --- iv-3.1/iv/src/include/InterViews/xymarker.h Thu Jun 18 01:17:35 1992 +++ iv-3.1-g++2.7.2/iv/src/include/InterViews/xymarker.h Tue Apr 2 13:52:57 1996 @@ -29,6 +29,10 @@ #ifndef iv_xymarker_h #define iv_xymarker_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Color; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/OS/directory.h iv-3.1-g++2.7.2/iv/src/include/OS/directory.h --- iv-3.1/iv/src/include/OS/directory.h Wed Oct 30 00:18:32 1991 +++ iv-3.1-g++2.7.2/iv/src/include/OS/directory.h Tue Apr 2 13:52:57 1996 @@ -25,6 +25,10 @@ #ifndef os_directory_h #define os_directory_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class DirectoryImpl; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/OS/enter-scope.h iv-3.1-g++2.7.2/iv/src/include/OS/enter-scope.h --- iv-3.1/iv/src/include/OS/enter-scope.h Tue Feb 11 18:23:38 1992 +++ iv-3.1-g++2.7.2/iv/src/include/OS/enter-scope.h Tue Apr 2 13:52:58 1996 @@ -22,8 +22,8 @@ * OF THIS SOFTWARE. */ -#ifndef os__scope_h -#define os__scope_h +#ifndef iv_os__scope_h +#define iv_os__scope_h #include @@ -37,8 +37,8 @@ #define nil 0 #endif -#ifndef os_boolean -#define os_boolean +#ifndef iv_os_boolean +#define iv_os_boolean typedef unsigned boolean; @@ -47,8 +47,8 @@ #endif -#ifndef os_u_char -#define os_u_char +#ifndef iv_os_u_char +#define iv_os_u_char typedef unsigned char u_char; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/OS/file.h iv-3.1-g++2.7.2/iv/src/include/OS/file.h --- iv-3.1/iv/src/include/OS/file.h Tue Feb 11 19:05:51 1992 +++ iv-3.1-g++2.7.2/iv/src/include/OS/file.h Tue Apr 2 13:52:58 1996 @@ -25,6 +25,10 @@ #ifndef os_file_h #define os_file_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class FileInfo; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/OS/host.h iv-3.1-g++2.7.2/iv/src/include/OS/host.h --- iv-3.1/iv/src/include/OS/host.h Tue Feb 11 19:05:47 1992 +++ iv-3.1-g++2.7.2/iv/src/include/OS/host.h Tue Apr 2 13:52:58 1996 @@ -25,6 +25,10 @@ #ifndef os_host_h #define os_host_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Host { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/OS/leave-scope.h iv-3.1-g++2.7.2/iv/src/include/OS/leave-scope.h --- iv-3.1/iv/src/include/OS/leave-scope.h Fri Mar 8 19:34:16 1991 +++ iv-3.1-g++2.7.2/iv/src/include/OS/leave-scope.h Tue Apr 2 13:52:58 1996 @@ -22,8 +22,8 @@ * OF THIS SOFTWARE. */ -#ifdef os__scope_h -#undef os__scope_h +#ifdef iv_os__scope_h +#undef iv_os__scope_h #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/OS/list.h iv-3.1-g++2.7.2/iv/src/include/OS/list.h --- iv-3.1/iv/src/include/OS/list.h Wed Oct 28 20:28:39 1992 +++ iv-3.1-g++2.7.2/iv/src/include/OS/list.h Tue Apr 2 13:52:58 1996 @@ -29,6 +29,10 @@ #ifndef os_list_h #define os_list_h +#ifdef __GNUG__ +#pragma interface +#endif + #include extern void ListImpl_range_error(long index); diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/OS/memory.h iv-3.1-g++2.7.2/iv/src/include/OS/memory.h --- iv-3.1/iv/src/include/OS/memory.h Thu Mar 14 02:05:16 1991 +++ iv-3.1-g++2.7.2/iv/src/include/OS/memory.h Tue Apr 2 13:52:58 1996 @@ -25,6 +25,10 @@ #ifndef os_memory_h #define os_memory_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Memory { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/OS/string.h iv-3.1-g++2.7.2/iv/src/include/OS/string.h --- iv-3.1/iv/src/include/OS/string.h Mon Jun 8 09:36:09 1992 +++ iv-3.1-g++2.7.2/iv/src/include/OS/string.h Tue Apr 2 13:52:58 1996 @@ -25,6 +25,10 @@ #ifndef os_string_h #define os_string_h +#ifdef __GNUG__ +#pragma interface +#endif + /* * String - simple (non-copying) string class */ @@ -33,6 +37,9 @@ class String { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif String(); String(const char*); String(const char*, int length); @@ -90,6 +97,9 @@ class CopyString : public String { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif CopyString(); CopyString(const char*); CopyString(const char*, int length); @@ -110,6 +120,9 @@ class NullTerminatedString : public String { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif NullTerminatedString(); NullTerminatedString(const String&); NullTerminatedString(const NullTerminatedString&); diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/OS/table.h iv-3.1-g++2.7.2/iv/src/include/OS/table.h --- iv-3.1/iv/src/include/OS/table.h Fri Aug 21 23:47:39 1992 +++ iv-3.1-g++2.7.2/iv/src/include/OS/table.h Tue Apr 2 13:52:58 1996 @@ -44,7 +44,7 @@ #endif #define declareTable(Table,Key,Value) \ -class TableEntry(Table); \ +struct TableEntry(Table); \ \ class Table { \ public: \ @@ -65,7 +65,7 @@ TableEntry(Table)*& probe(Key); \ }; \ \ -class TableEntry(Table) { \ +struct TableEntry(Table) { \ private: \ friend class Table; \ friend class TableIterator(Table); \ diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/OS/table2.h iv-3.1-g++2.7.2/iv/src/include/OS/table2.h --- iv-3.1/iv/src/include/OS/table2.h Mon Jun 29 20:42:19 1992 +++ iv-3.1-g++2.7.2/iv/src/include/OS/table2.h Tue Apr 2 13:52:59 1996 @@ -44,7 +44,7 @@ #endif #define declareTable2(Table2,Key1,Key2,Value) \ -class Table2Entry(Table2); \ +struct Table2Entry(Table2); \ \ class Table2 { \ public: \ @@ -64,7 +64,7 @@ Table2Entry(Table2)*& probe(Key1, Key2); \ }; \ \ -class Table2Entry(Table2) { \ +struct Table2Entry(Table2) { \ private: \ friend class Table2; \ friend class Table2Iterator(Table2); \ diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/OS/ustring.h iv-3.1-g++2.7.2/iv/src/include/OS/ustring.h --- iv-3.1/iv/src/include/OS/ustring.h Wed Feb 19 01:46:45 1992 +++ iv-3.1-g++2.7.2/iv/src/include/OS/ustring.h Tue Apr 2 13:52:59 1996 @@ -25,6 +25,10 @@ #ifndef os_ustring_h #define os_ustring_h +#ifdef __GNUG__ +#pragma interface +#endif + /* * UniqueString - unique string using hash table */ @@ -36,6 +40,9 @@ class UniqueString : public String { public: +#ifdef _DELTA_EXTENSIONS +#pragma __static_class +#endif UniqueString(); UniqueString(const char*); UniqueString(const char*, int length); diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Commands/align.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/align.h --- iv-3.1/iv/src/include/Unidraw/Commands/align.h Tue Apr 28 00:04:12 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/align.h Tue Apr 2 13:52:59 1996 @@ -28,6 +28,10 @@ #ifndef unidraw_commands_align_h #define unidraw_commands_align_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class GraphicComp; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Commands/brushcmd.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/brushcmd.h --- iv-3.1/iv/src/include/Unidraw/Commands/brushcmd.h Tue Apr 28 00:04:13 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/brushcmd.h Tue Apr 2 13:52:59 1996 @@ -27,6 +27,10 @@ #ifndef unidraw_commands_brushcmd_h #define unidraw_commands_brushcmd_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class PSBrush; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Commands/catcmds.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/catcmds.h --- iv-3.1/iv/src/include/Unidraw/Commands/catcmds.h Tue Apr 28 00:04:14 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/catcmds.h Tue Apr 2 13:52:59 1996 @@ -27,6 +27,10 @@ #ifndef unidraw_commands_catcmds_h #define unidraw_commands_catcmds_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #undef FileChooser diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Commands/colorcmd.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/colorcmd.h --- iv-3.1/iv/src/include/Unidraw/Commands/colorcmd.h Tue Apr 28 00:04:14 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/colorcmd.h Tue Apr 2 13:52:59 1996 @@ -27,6 +27,10 @@ #ifndef unidraw_commands_colorcmd_h #define unidraw_commands_colorcmd_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class PSColor; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Commands/command.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/command.h --- iv-3.1/iv/src/include/Unidraw/Commands/command.h Tue Jun 9 20:02:03 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/command.h Tue Apr 2 13:52:59 1996 @@ -28,6 +28,10 @@ #ifndef unidraw_commands_command_h #define unidraw_commands_command_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Clipboard; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Commands/data.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/data.h --- iv-3.1/iv/src/include/Unidraw/Commands/data.h Tue Apr 28 00:05:13 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/data.h Tue Apr 2 13:52:59 1996 @@ -28,6 +28,10 @@ #ifndef unidraw_commands_data_h #define unidraw_commands_data_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Commands/datas.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/datas.h --- iv-3.1/iv/src/include/Unidraw/Commands/datas.h Tue Apr 28 00:04:16 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/datas.h Tue Apr 2 13:52:59 1996 @@ -31,6 +31,10 @@ #ifndef unidraw_commands_datas_h #define unidraw_commands_datas_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Commands/edit.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/edit.h --- iv-3.1/iv/src/include/Unidraw/Commands/edit.h Tue Apr 28 00:04:17 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/edit.h Tue Apr 2 13:53:00 1996 @@ -27,6 +27,10 @@ #ifndef unidraw_commands_edit_h #define unidraw_commands_edit_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Connector; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Commands/font.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/font.h --- iv-3.1/iv/src/include/Unidraw/Commands/font.h Tue Apr 28 00:04:18 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/font.h Tue Apr 2 13:53:00 1996 @@ -27,6 +27,10 @@ #ifndef unidraw_commands_font_h #define unidraw_commands_font_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class PSFont; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Commands/import.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/import.h --- iv-3.1/iv/src/include/Unidraw/Commands/import.h Wed Apr 29 00:40:52 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/import.h Tue Apr 2 13:53:00 1996 @@ -27,6 +27,10 @@ #ifndef unidraw_commands_import_h #define unidraw_commands_import_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #undef FileChooser diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Commands/macro.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/macro.h --- iv-3.1/iv/src/include/Unidraw/Commands/macro.h Tue Apr 28 00:37:03 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/macro.h Tue Apr 2 13:53:00 1996 @@ -27,6 +27,10 @@ #ifndef unidraw_commands_macro_h #define unidraw_commands_macro_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class UList; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Commands/nop.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/nop.h --- iv-3.1/iv/src/include/Unidraw/Commands/nop.h Tue Apr 28 00:04:19 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/nop.h Tue Apr 2 13:53:00 1996 @@ -27,6 +27,10 @@ #ifndef unidraw_commands_nop_h #define unidraw_commands_nop_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class NOPCmd : public Command { diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Commands/patcmd.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/patcmd.h --- iv-3.1/iv/src/include/Unidraw/Commands/patcmd.h Tue Apr 28 00:04:20 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/patcmd.h Tue Apr 2 13:53:00 1996 @@ -27,6 +27,10 @@ #ifndef unidraw_commands_patcmd_h #define unidraw_commands_patcmd_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class PSPattern; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Commands/struct.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/struct.h --- iv-3.1/iv/src/include/Unidraw/Commands/struct.h Tue Apr 28 00:04:20 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/struct.h Tue Apr 2 13:53:00 1996 @@ -27,6 +27,10 @@ #ifndef unidraw_commands_struct_h #define unidraw_commands_struct_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class GraphicComp; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Commands/transforms.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/transforms.h --- iv-3.1/iv/src/include/Unidraw/Commands/transforms.h Tue Apr 28 00:04:21 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/transforms.h Tue Apr 2 13:53:00 1996 @@ -27,6 +27,10 @@ #ifndef unidraw_commands_transforms_h #define unidraw_commands_transforms_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Commands/viewcmds.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/viewcmds.h --- iv-3.1/iv/src/include/Unidraw/Commands/viewcmds.h Mon Jul 13 19:15:12 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Commands/viewcmds.h Tue Apr 2 13:53:00 1996 @@ -27,6 +27,10 @@ #ifndef unidraw_commands_viewcmds_h #define unidraw_commands_viewcmds_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class ControlInfo; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Components/cglue.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/cglue.h --- iv-3.1/iv/src/include/Unidraw/Components/cglue.h Tue Apr 28 00:07:53 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/cglue.h Tue Apr 2 13:53:01 1996 @@ -27,6 +27,10 @@ #ifndef unidraw_components_cglue_h #define unidraw_components_cglue_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Components/component.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/component.h --- iv-3.1/iv/src/include/Unidraw/Components/component.h Tue Apr 28 00:06:37 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/component.h Tue Apr 2 13:53:01 1996 @@ -29,6 +29,10 @@ #ifndef unidraw_components_component_h #define unidraw_components_component_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Command; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Components/compview.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/compview.h --- iv-3.1/iv/src/include/Unidraw/Components/compview.h Tue Apr 28 00:06:38 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/compview.h Tue Apr 2 13:53:01 1996 @@ -27,6 +27,10 @@ #ifndef unidraw_components_compview_h #define unidraw_components_compview_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class Command; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Components/connector.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/connector.h --- iv-3.1/iv/src/include/Unidraw/Components/connector.h Tue Jun 9 20:05:40 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/connector.h Tue Apr 2 13:53:01 1996 @@ -28,6 +28,10 @@ #ifndef unidraw_components_connector_h #define unidraw_components_connector_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Components/csolver.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/csolver.h --- iv-3.1/iv/src/include/Unidraw/Components/csolver.h Tue Jun 9 20:03:30 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/csolver.h Tue Apr 2 13:53:01 1996 @@ -27,6 +27,10 @@ #ifndef unidraw_csolver_h #define unidraw_csolver_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class CCnxn; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Components/ellipse.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/ellipse.h --- iv-3.1/iv/src/include/Unidraw/Components/ellipse.h Tue Apr 28 00:06:40 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/ellipse.h Tue Apr 2 13:53:01 1996 @@ -27,6 +27,10 @@ #ifndef unidraw_components_ellipse_h #define unidraw_components_ellipse_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Components/externview.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/externview.h --- iv-3.1/iv/src/include/Unidraw/Components/externview.h Tue Apr 28 00:06:40 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/externview.h Tue Apr 2 13:53:01 1996 @@ -27,6 +27,10 @@ #ifndef unidraw_components_externview_h #define unidraw_components_externview_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class ostream; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Components/grcomp.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/grcomp.h --- iv-3.1/iv/src/include/Unidraw/Components/grcomp.h Tue Apr 28 00:06:41 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/grcomp.h Tue Apr 2 13:53:01 1996 @@ -28,6 +28,10 @@ #ifndef unidraw_components_grcomp_h #define unidraw_components_grcomp_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Components/grview.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/grview.h --- iv-3.1/iv/src/include/Unidraw/Components/grview.h Tue Apr 28 00:06:42 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/grview.h Tue Apr 2 13:53:01 1996 @@ -28,6 +28,10 @@ #ifndef unidraw_components_grview_h #define unidraw_components_grview_h +#ifdef __GNUG__ +#pragma interface +#endif + #include #include diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.noshared -x LINUX -x make.out -x make.err -x *.old -x *.org -x *.orig -x jump.params -x jump.undefs iv-3.1/iv/src/include/Unidraw/Components/gvupdater.h iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/gvupdater.h --- iv-3.1/iv/src/include/Unidraw/Components/gvupdater.h Tue Jun 9 20:05:41 1992 +++ iv-3.1-g++2.7.2/iv/src/include/Unidraw/Components/gvupdater.h Tue Apr 2 13:53:02 1996 @@ -28,6 +28,10 @@ #ifndef unidraw_components_gvupdater_h #define unidraw_components_gvupdater_h +#ifdef __GNUG__ +#pragma interface +#endif + #include class GraphicView; diff -ruN -x Makefile -x Makefile.bak -x nohup.out* -x *.bak -x .depend* -x ALPHA -x ALPHA.debug -x used-patches -x ALPHA.nosh