Path: utzoo!utgpu!jarvis.csri.toronto.edu!cs.utexas.edu!uunet!ssbell!kent
Newsgroups: comp.sources.x
Subject: v05i050: Xtartan -- generate a Scottish tartan as background, Patch1
Message-ID: <609@ssbell.uu.net>
Date: 4 Jan 90 15:49:14 GMT
Organization: Sterling Software, FSG-IMD, Bellevue, NE
Lines: 1249
Approved: kent@ssbell.uu.net (Kent Landfield)

Submitted-by: uunet!zax!sci!jimmc (Jim McBeath)
Posting-number: Volume 5, Issue 50
Archive-name: xtartan/patch1
Patch-To: xtartan: Volume 5, Issue 20

	Patch1 to xtartan corrects a problem in the TI*.h files which
	causes compilation errors in ANSI-standard C compilers.  One set
	of braces was missing in a nested structure initialization.  If
	you had problems compiling xtartan before, you can try again with 
	these include files.  The patch also includes a corrected Imakefile.

#! /bin/sh
# This is a shell archive.  Remove anything before this line, then unpack
# it by saving it into a file and typing "sh file".  To overwrite existing
# files, type "sh file -c".  You can also feed this as standard input via
# unshar, or by typing "sh <file", e.g..  If this archive is complete, you
# will see the following message at the end:
#		"End of shell archive."
# Contents:  xtartan.patch1
# Wrapped by kent@ssbell on Wed Jan  3 22:18:58 1990
PATH=/bin:/usr/bin:/usr/ucb ; export PATH
if test -f 'xtartan.patch1' -a "${1}" != "-c" ; then 
  echo shar: Will not clobber existing file \"'xtartan.patch1'\"
else
echo shar: Extracting \"'xtartan.patch1'\" \(22434 characters\)
sed "s/^X//" >'xtartan.patch1' <<'END_OF_FILE'
Xdiff -cN ../orig/Imakefile ./Imakefile
X*** ../orig/Imakefile	Wed Jan  3 21:21:05 1990
X--- ./Imakefile	Wed Jan  3 21:21:43 1990
X***************
X*** 1,5 ****
X--- 1,7 ----
X  LOCAL_LIBRARIES = 
X    SYS_LIBRARIES = -lXt -lX11
X+            OBJS = actions.o color.o draw.o main.o misc.o setrootbg.o
X+            SRCS = actions.c color.c draw.c main.c misc.c setrootbg.c
X  
X  all:: xtartan
X  
X***************
X*** 7,11 ****
X  
X  depend::	alltartansh
X  
X! SimpleProgramTarget(xtartan)
X! 
X--- 9,12 ----
X  
X  depend::	alltartansh
X  
X! ComplexProgramTarget(xtartan)
Xdiff -cN ../orig/README.patch1 ./README.patch1
X*** ../orig/README.patch1	Wed Dec 31 18:00:00 1969
X--- ./README.patch1	Wed Jan  3 21:54:41 1990
X***************
X*** 0 ****
X--- 1,9 ----
X+ Patch1 to xtartan corrects a problem in the TI*.h files which causes
X+ compilation errors in ANSI-standard C compilers.  One set of braces was
X+ missing in a nested structure initialization.  If you had problems compiling
X+ xtartan before, you can try again with these include files.  
X+ 
X+ The patch also includes a corrected Imakefile.
X+ 
X+ -Jim McBeath    11.Dec.89
X+  sci!jimmc@decwrl.dec.com
Xdiff -cN ../orig/TIBarclay.h ./TIBarclay.h
X*** ../orig/TIBarclay.h	Wed Jan  3 21:21:05 1990
X--- ./TIBarclay.h	Wed Jan  3 21:21:44 1990
X***************
X*** 3,14 ****
X  {
X  	"Barclay",
X  	"Black",
X! 	{ SYM,
X  		{ "White", 2, 0 },
X  		{ "Yellow", 12, 0 },
X  		{ "Black", 12, 0 },
X  		{ "Yellow", 2, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 3,14 ----
X  {
X  	"Barclay",
X  	"Black",
X! 	{ SYM, {
X  		{ "White", 2, 0 },
X  		{ "Yellow", 12, 0 },
X  		{ "Black", 12, 0 },
X  		{ "Yellow", 2, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIBlackW.h ./TIBlackW.h
X*** ../orig/TIBlackW.h	Wed Jan  3 21:21:05 1990
X--- ./TIBlackW.h	Wed Jan  3 21:21:44 1990
X***************
X*** 3,9 ****
X  {
X  	"Black_Watch",
X  	"Black",
X! 	{ SYM,
X  		{ "Black", 2, 0 },
X  		{ "MediumSeaGreen", 10, 0 },
X  		{ "Black", 8, 0 },
X--- 3,9 ----
X  {
X  	"Black_Watch",
X  	"Black",
X! 	{ SYM, {
X  		{ "Black", 2, 0 },
X  		{ "MediumSeaGreen", 10, 0 },
X  		{ "Black", 8, 0 },
X***************
X*** 24,30 ****
X  		{ "Navy", 9, 0 },
X  		{ "Black", 1, 0 },
X  		{ "Navy", 1, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 24,30 ----
X  		{ "Navy", 9, 0 },
X  		{ "Black", 1, 0 },
X  		{ "Navy", 1, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIBrodie.h ./TIBrodie.h
X*** ../orig/TIBrodie.h	Wed Jan  3 21:21:06 1990
X--- ./TIBrodie.h	Wed Jan  3 21:21:44 1990
X***************
X*** 3,9 ****
X  {
X  	"Brodie",
X  	"Red",
X! 	{ SYM,
X  		{ "Black", 2, 0 },
X  		{ "Red", 14, 0 },
X  		{ "Black", 6, 0 },
X--- 3,9 ----
X  {
X  	"Brodie",
X  	"Red",
X! 	{ SYM, {
X  		{ "Black", 2, 0 },
X  		{ "Red", 14, 0 },
X  		{ "Black", 6, 0 },
X***************
X*** 10,16 ****
X  		{ "Yellow", 2, 0 },
X  		{ "Black", 6, 0 },
X  		{ "Red", 2, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 10,16 ----
X  		{ "Yellow", 2, 0 },
X  		{ "Black", 6, 0 },
X  		{ "Red", 2, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIBruce.h ./TIBruce.h
X*** ../orig/TIBruce.h	Wed Jan  3 21:21:06 1990
X--- ./TIBruce.h	Wed Jan  3 21:21:44 1990
X***************
X*** 3,9 ****
X  {
X  	"Bruce",
X  	"Red",
X! 	{ SYM,
X  		{ "Yellow", 2, 0 },
X  		{ "Red", 10, 0 },
X  		{ "ForestGreen", 3, 0 },
X--- 3,9 ----
X  {
X  	"Bruce",
X  	"Red",
X! 	{ SYM, {
X  		{ "Yellow", 2, 0 },
X  		{ "Red", 10, 0 },
X  		{ "ForestGreen", 3, 0 },
X***************
X*** 10,16 ****
X  		{ "Red", 3, 0 },
X  		{ "ForestGreen", 8, 0 },
X  		{ "Red", 2, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 10,16 ----
X  		{ "Red", 3, 0 },
X  		{ "ForestGreen", 8, 0 },
X  		{ "Red", 2, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIBuchanan.h ./TIBuchanan.h
X*** ../orig/TIBuchanan.h	Wed Jan  3 21:21:06 1990
X--- ./TIBuchanan.h	Wed Jan  3 21:21:44 1990
X***************
X*** 3,9 ****
X  {
X  	"Buchanan",
X  	"Yellow",
X! 	{ 0,
X  		{ "Black", 5, 0 },
X  		{ "Red", 5, 0 },
X  		{ "Yellow", 1, 0 },
X--- 3,9 ----
X  {
X  	"Buchanan",
X  	"Yellow",
X! 	{ 0, {
X  		{ "Black", 5, 0 },
X  		{ "Red", 5, 0 },
X  		{ "Yellow", 1, 0 },
X***************
X*** 16,22 ****
X  		{ "Yellow", 5, 0 },
X  		{ "Black", 1, 0 },
X  		{ "Yellow", 5, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 16,22 ----
X  		{ "Yellow", 5, 0 },
X  		{ "Black", 1, 0 },
X  		{ "Yellow", 5, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TICameron.h ./TICameron.h
X*** ../orig/TICameron.h	Wed Jan  3 21:21:06 1990
X--- ./TICameron.h	Wed Jan  3 21:21:44 1990
X***************
X*** 3,9 ****
X  {
X  	"Cameron",
X  	"Red",
X! 	{ SYM,
X  		{ "Yellow", 1, 0 },
X  		{ "Red", 11, 0 },
X  		{ "ForestGreen", 5, 0 },
X--- 3,9 ----
X  {
X  	"Cameron",
X  	"Red",
X! 	{ SYM, {
X  		{ "Yellow", 1, 0 },
X  		{ "Red", 11, 0 },
X  		{ "ForestGreen", 5, 0 },
X***************
X*** 10,16 ****
X  		{ "Red", 2, 0 },
X  		{ "ForestGreen", 5, 0 },
X  		{ "Red", 2, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 10,16 ----
X  		{ "Red", 2, 0 },
X  		{ "ForestGreen", 5, 0 },
X  		{ "Red", 2, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TICampbell.h ./TICampbell.h
X*** ../orig/TICampbell.h	Wed Jan  3 21:21:06 1990
X--- ./TICampbell.h	Wed Jan  3 21:21:44 1990
X***************
X*** 3,9 ****
X  {
X  	"Campbell_of_Argyll",
X  	"SteelBlue",
X! 	{ SYM,
X  		{ "SteelBlue", 6, 0 },
X  		{ "Black", 1, 0 },
X  		{ "SteelBlue", 1, 0 },
X--- 3,9 ----
X  {
X  	"Campbell_of_Argyll",
X  	"SteelBlue",
X! 	{ SYM, {
X  		{ "SteelBlue", 6, 0 },
X  		{ "Black", 1, 0 },
X  		{ "SteelBlue", 1, 0 },
X***************
X*** 17,23 ****
X  		{ "SteelBlue", 6, 0 },
X  		{ "Black", 1, 0 },
X  		{ "SteelBlue", 1, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 17,23 ----
X  		{ "SteelBlue", 6, 0 },
X  		{ "Black", 1, 0 },
X  		{ "SteelBlue", 1, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
X***************
X*** 26,32 ****
X  {
X  	"Campbell_of_Breadalbane",
X  	"Black",
X! 	{ SYM,
X  		{ "Black", 5, 0 },
X  		{ "ForestGreen", 7, 0 },
X  		{ "Yellow", 2, 0 },
X--- 26,32 ----
X  {
X  	"Campbell_of_Breadalbane",
X  	"Black",
X! 	{ SYM, {
X  		{ "Black", 5, 0 },
X  		{ "ForestGreen", 7, 0 },
X  		{ "Yellow", 2, 0 },
X***************
X*** 34,40 ****
X  		{ "Black", 7, 0 },
X  		{ "MidnightBlue", 7, 0 },
X  		{ "Black", 2, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 34,40 ----
X  		{ "Black", 7, 0 },
X  		{ "MidnightBlue", 7, 0 },
X  		{ "Black", 2, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
X***************
X*** 43,49 ****
X  {
X  	"Campbell_of_Cawdor",
X  	"Black",
X! 	{ SYM,
X  		{ "SteelBlue", 2, 0 },
X  		{ "Black", 1, 0 },
X  		{ "ForestGreen", 7, 0 },
X--- 43,49 ----
X  {
X  	"Campbell_of_Cawdor",
X  	"Black",
X! 	{ SYM, {
X  		{ "SteelBlue", 2, 0 },
X  		{ "Black", 1, 0 },
X  		{ "ForestGreen", 7, 0 },
X***************
X*** 50,56 ****
X  		{ "Black", 7, 0 },
X  		{ "Navy", 8, 0 },
X  		{ "Red", 2, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 50,56 ----
X  		{ "Black", 7, 0 },
X  		{ "Navy", 8, 0 },
X  		{ "Red", 2, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIChisholm.h ./TIChisholm.h
X*** ../orig/TIChisholm.h	Wed Jan  3 21:21:06 1990
X--- ./TIChisholm.h	Wed Jan  3 21:21:44 1990
X***************
X*** 3,15 ****
X  {
X  	"Chisholm",
X  	"Red",
X! 	{ SYM,
X  		{ "Red", 2, 0 },
X  		{ "Yellow", 1, 0 },
X  		{ "Red", 13, 0 },
X  		{ "ForestGreen", 14, 0 },
X  		{ "Red", 1, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 3,15 ----
X  {
X  	"Chisholm",
X  	"Red",
X! 	{ SYM, {
X  		{ "Red", 2, 0 },
X  		{ "Yellow", 1, 0 },
X  		{ "Red", 13, 0 },
X  		{ "ForestGreen", 14, 0 },
X  		{ "Red", 1, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIDuncan.h ./TIDuncan.h
X*** ../orig/TIDuncan.h	Wed Jan  3 21:21:06 1990
X--- ./TIDuncan.h	Wed Jan  3 21:21:44 1990
X***************
X*** 3,9 ****
X  {
X  	"Duncan",
X  	"Black",
X! 	{ SYM,
X  		{ "Red", 2, 0 },
X  		{ "Black", 9, 0 },
X  		{ "ForestGreen", 9, 0 },
X--- 3,9 ----
X  {
X  	"Duncan",
X  	"Black",
X! 	{ SYM, {
X  		{ "Red", 2, 0 },
X  		{ "Black", 9, 0 },
X  		{ "ForestGreen", 9, 0 },
X***************
X*** 10,16 ****
X  		{ "White", 2, 0 },
X  		{ "ForestGreen", 9, 0 },
X  		{ "Black", 2, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 10,16 ----
X  		{ "White", 2, 0 },
X  		{ "ForestGreen", 9, 0 },
X  		{ "Black", 2, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIElliot.h ./TIElliot.h
X*** ../orig/TIElliot.h	Wed Jan  3 21:21:06 1990
X--- ./TIElliot.h	Wed Jan  3 21:21:44 1990
X***************
X*** 3,14 ****
X  {
X  	"Elliot",
X  	"MediumBlue",
X! 	{ SYM,
X  		{ "MediumBlue", 30, 0 },
X  		{ "Black", 10, 0 },
X  		{ "MediumBlue", 5, 0 },
X  		{ "Red", 2, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 3,14 ----
X  {
X  	"Elliot",
X  	"MediumBlue",
X! 	{ SYM, {
X  		{ "MediumBlue", 30, 0 },
X  		{ "Black", 10, 0 },
X  		{ "MediumBlue", 5, 0 },
X  		{ "Red", 2, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIErskine.h ./TIErskine.h
X*** ../orig/TIErskine.h	Wed Jan  3 21:21:06 1990
X--- ./TIErskine.h	Wed Jan  3 21:21:44 1990
X***************
X*** 3,9 ****
X  {
X  	"Erskine",
X  	"Red",
X! 	{ SYM,
X  		{ "Red", 2, 0 },
X  		{ "Black", 1, 0 },
X  		{ "Red", 10, 0 },
X--- 3,9 ----
X  {
X  	"Erskine",
X  	"Red",
X! 	{ SYM, {
X  		{ "Red", 2, 0 },
X  		{ "Black", 1, 0 },
X  		{ "Red", 10, 0 },
X***************
X*** 10,16 ****
X  		{ "ForestGreen", 10, 0 },
X  		{ "Red", 1, 0 },
X  		{ "ForestGreen", 2, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 10,16 ----
X  		{ "ForestGreen", 10, 0 },
X  		{ "Red", 1, 0 },
X  		{ "ForestGreen", 2, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIFarq.h ./TIFarq.h
X*** ../orig/TIFarq.h	Wed Jan  3 21:21:06 1990
X--- ./TIFarq.h	Wed Jan  3 21:21:44 1990
X***************
X*** 3,15 ****
X  {
X  	"Farquharson",
X  	"ForestGreen",
X! 	{ SYM,
X  		{ "Yellow", 1, 0 },
X  		{ "ForestGreen", 6, 0 },
X  		{ "Black", 6, 0 },
X  		{ "Navy", 7, 0 },
X  		{ "Red", 1, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 3,15 ----
X  {
X  	"Farquharson",
X  	"ForestGreen",
X! 	{ SYM, {
X  		{ "Yellow", 1, 0 },
X  		{ "ForestGreen", 6, 0 },
X  		{ "Black", 6, 0 },
X  		{ "Navy", 7, 0 },
X  		{ "Red", 1, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIGow.h ./TIGow.h
X*** ../orig/TIGow.h	Wed Jan  3 21:21:06 1990
X--- ./TIGow.h	Wed Jan  3 21:21:44 1990
X***************
X*** 3,15 ****
X  {
X  	"Gow",
X  	"Red",
X! 	{ SYM,
X  		{ "Red", 12, 0 },
X  		{ "ForestGreen", 12, 0 },
X  		{ "Red", 2, 0 },
X  		{ "Black", 12, 0 },
X  		{ "Red", 12, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 3,15 ----
X  {
X  	"Gow",
X  	"Red",
X! 	{ SYM, {
X  		{ "Red", 12, 0 },
X  		{ "ForestGreen", 12, 0 },
X  		{ "Red", 2, 0 },
X  		{ "Black", 12, 0 },
X  		{ "Red", 12, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIMacArthr.h ./TIMacArthr.h
X*** ../orig/TIMacArthr.h	Wed Jan  3 21:21:06 1990
X--- ./TIMacArthr.h	Wed Jan  3 21:21:45 1990
X***************
X*** 3,15 ****
X  {
X  	"MacArthur",
X  	"ForestGreen",
X! 	{ SYM,
X  		{ "DarkGreen", 13, 0 },
X  		{ "ForestGreen", 3, NOP },
X  		{ "DarkGreen", 3, 0 },
X  		{ "ForestGreen", 11, NOP },
X  		{ "Yellow", 1, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 3,15 ----
X  {
X  	"MacArthur",
X  	"ForestGreen",
X! 	{ SYM, {
X  		{ "DarkGreen", 13, 0 },
X  		{ "ForestGreen", 3, NOP },
X  		{ "DarkGreen", 3, 0 },
X  		{ "ForestGreen", 11, NOP },
X  		{ "Yellow", 1, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIMacAulay.h ./TIMacAulay.h
X*** ../orig/TIMacAulay.h	Wed Jan  3 21:21:06 1990
X--- ./TIMacAulay.h	Wed Jan  3 21:21:45 1990
X***************
X*** 3,9 ****
X  {
X  	"MacAulay",
X  	"Red",
X! 	{ SYM,
X  		{ "Black", 1, 0 },
X  		{ "Red", 14, 0 },
X  		{ "ForestGreen", 5, 0 },
X--- 3,9 ----
X  {
X  	"MacAulay",
X  	"Red",
X! 	{ SYM, {
X  		{ "Black", 1, 0 },
X  		{ "Red", 14, 0 },
X  		{ "ForestGreen", 5, 0 },
X***************
X*** 10,16 ****
X  		{ "Red", 3, 0 },
X  		{ "ForestGreen", 7, 0 },
X  		{ "White", 1, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 10,16 ----
X  		{ "Red", 3, 0 },
X  		{ "ForestGreen", 7, 0 },
X  		{ "White", 1, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIMacBean.h ./TIMacBean.h
X*** ../orig/TIMacBean.h	Wed Jan  3 21:21:06 1990
X--- ./TIMacBean.h	Wed Jan  3 21:21:45 1990
X***************
X*** 3,9 ****
X  {
X  	"MacBean",
X  	"Red",
X! 	{ SYM,
X  		{ "Red", 21, NOP },	/* background stripe */
X  		{ "White", 1, 0 },
X  		{ "Black", 1, 0 },
X--- 3,9 ----
X  {
X  	"MacBean",
X  	"Red",
X! 	{ SYM, {
X  		{ "Red", 21, NOP },	/* background stripe */
X  		{ "White", 1, 0 },
X  		{ "Black", 1, 0 },
X***************
X*** 18,24 ****
X  		{ "Red", 3, NOP },	/* background */
X  		{ "White", 1, 0 },
X  		{ "ForestGreen", 2, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 18,24 ----
X  		{ "Red", 3, NOP },	/* background */
X  		{ "White", 1, 0 },
X  		{ "ForestGreen", 2, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIMacBeth.h ./TIMacBeth.h
X*** ../orig/TIMacBeth.h	Wed Jan  3 21:21:07 1990
X--- ./TIMacBeth.h	Wed Jan  3 21:21:45 1990
X***************
X*** 3,9 ****
X  {
X  	"MacBeth",
X  	"Blue",
X! 	{ SYM,
X  		{ "Blue", 30, NOP },	/* background stripe */
X  		{ "Yellow", 2, 0 },
X  		{ "Black", 4, 0 },
X--- 3,9 ----
X  {
X  	"MacBeth",
X  	"Blue",
X! 	{ SYM, {
X  		{ "Blue", 30, NOP },	/* background stripe */
X  		{ "Yellow", 2, 0 },
X  		{ "Black", 4, 0 },
X***************
X*** 16,22 ****
X  		{ "Black", 2, 0 },
X  		{ "Red", 4, 0 },
X  		{ "White", 1, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 16,22 ----
X  		{ "Black", 2, 0 },
X  		{ "Red", 4, 0 },
X  		{ "White", 1, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIMacDuff.h ./TIMacDuff.h
X*** ../orig/TIMacDuff.h	Wed Jan  3 21:21:11 1990
X--- ./TIMacDuff.h	Wed Jan  3 21:21:45 1990
X***************
X*** 3,9 ****
X  {
X  	"MacDuff",
X  	"Red",
X! 	{ SYM,
X  		{ "Red", 13, NOP },	/* background stripe */
X  		{ "MediumBlue", 3, 0 },
X  		{ "Black", 5, 0 },
X--- 3,9 ----
X  {
X  	"MacDuff",
X  	"Red",
X! 	{ SYM, {
X  		{ "Red", 13, NOP },	/* background stripe */
X  		{ "MediumBlue", 3, 0 },
X  		{ "Black", 5, 0 },
X***************
X*** 11,17 ****
X  		{ "Red", 4, NOP },	/* background */
X  		{ "Black", 1, 0 },
X  		{ "Red", 4, NOP },	/* background */
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 11,17 ----
X  		{ "Red", 4, NOP },	/* background */
X  		{ "Black", 1, 0 },
X  		{ "Red", 4, NOP },	/* background */
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIMacIver.h ./TIMacIver.h
X*** ../orig/TIMacIver.h	Wed Jan  3 21:21:12 1990
X--- ./TIMacIver.h	Wed Jan  3 21:21:45 1990
X***************
X*** 3,15 ****
X  {
X  	"MacIver",
X  	"Red",
X! 	{ SYM,
X  		{ "Black", 16, 0 },
X  		{ "Red", 2, 0 },
X  		{ "Black", 2, 0 },
X  		{ "Red", 12, 0 },
X  		{ "White", 1, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 3,15 ----
X  {
X  	"MacIver",
X  	"Red",
X! 	{ SYM, {
X  		{ "Black", 16, 0 },
X  		{ "Red", 2, 0 },
X  		{ "Black", 2, 0 },
X  		{ "Red", 12, 0 },
X  		{ "White", 1, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIRainbow1.h ./TIRainbow1.h
X*** ../orig/TIRainbow1.h	Wed Jan  3 21:21:12 1990
X--- ./TIRainbow1.h	Wed Jan  3 21:21:45 1990
X***************
X*** 3,9 ****
X  {
X  	"Rainbow1",
X  	"White",
X! 	{ 0,
X  		{ "Black", 4, 0 },
X  		{ "Red", 4, 0 },
X  		{ "Green", 4, 0 },
X--- 3,9 ----
X  {
X  	"Rainbow1",
X  	"White",
X! 	{ 0, {
X  		{ "Black", 4, 0 },
X  		{ "Red", 4, 0 },
X  		{ "Green", 4, 0 },
X***************
X*** 12,18 ****
X  		{ "Magenta", 4, 0 },
X  		{ "Cyan", 4, 0 },
X  		{ "White", 4, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 12,18 ----
X  		{ "Magenta", 4, 0 },
X  		{ "Cyan", 4, 0 },
X  		{ "White", 4, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIRainbow2.h ./TIRainbow2.h
X*** ../orig/TIRainbow2.h	Wed Jan  3 21:21:12 1990
X--- ./TIRainbow2.h	Wed Jan  3 21:21:45 1990
X***************
X*** 3,9 ****
X  {
X  	"Rainbow2",
X  	"White",
X! 	{ 0,
X  		{ "Black", 4, 0 },
X  		{ "Red", 4, 0 },
X  		{ "Green", 4, 0 },
X--- 3,9 ----
X  {
X  	"Rainbow2",
X  	"White",
X! 	{ 0, {
X  		{ "Black", 4, 0 },
X  		{ "Red", 4, 0 },
X  		{ "Green", 4, 0 },
X***************
X*** 12,20 ****
X  		{ "Magenta", 4, 0 },
X  		{ "Cyan", 4, 0 },
X  		{ "White", 4, 0 },
X! 		{ 0 }
X  	},
X! 	{ 0,
X  		{ "LightGrey", 4, 0 },
X  		{ "Coral", 4, 0 },
X  		{ "ForestGreen", 4, 0 },
X--- 12,20 ----
X  		{ "Magenta", 4, 0 },
X  		{ "Cyan", 4, 0 },
X  		{ "White", 4, 0 },
X! 		{ 0 }}
X  	},
X! 	{ 0, {
X  		{ "LightGrey", 4, 0 },
X  		{ "Coral", 4, 0 },
X  		{ "ForestGreen", 4, 0 },
X***************
X*** 23,29 ****
X  		{ "Maroon", 4, 0 },
X  		{ "Turquoise", 4, 0 },
X  		{ "Wheat", 4, 0 },
X! 		{ 0 }
X  	},
X  },
X  
X--- 23,29 ----
X  		{ "Maroon", 4, 0 },
X  		{ "Turquoise", 4, 0 },
X  		{ "Wheat", 4, 0 },
X! 		{ 0 }}
X  	},
X  },
X  
Xdiff -cN ../orig/TIRobRoy.h ./TIRobRoy.h
X*** ../orig/TIRobRoy.h	Wed Jan  3 21:21:12 1990
X--- ./TIRobRoy.h	Wed Jan  3 21:21:45 1990
X***************
X*** 3,12 ****
X  {
X  	"Rob_Roy",
X  	"Black",
X! 	{ SYM,
X  		{ "Black", 8, 0 },
X  		{ "Red", 8, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 3,12 ----
X  {
X  	"Rob_Roy",
X  	"Black",
X! 	{ SYM, {
X  		{ "Black", 8, 0 },
X  		{ "Red", 8, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIShepherd.h ./TIShepherd.h
X*** ../orig/TIShepherd.h	Wed Jan  3 21:21:12 1990
X--- ./TIShepherd.h	Wed Jan  3 21:21:45 1990
X***************
X*** 3,12 ****
X  {
X  	"Shepherd",
X  	"Black",
X! 	{ SYM,
X  		{ "Black", 1, 0 },
X  		{ "White", 1, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 3,12 ----
X  {
X  	"Shepherd",
X  	"Black",
X! 	{ SYM, {
X  		{ "Black", 1, 0 },
X  		{ "White", 1, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIShirt1.h ./TIShirt1.h
X*** ../orig/TIShirt1.h	Wed Jan  3 21:21:12 1990
X--- ./TIShirt1.h	Wed Jan  3 21:21:45 1990
X***************
X*** 3,9 ****
X  {
X  	"Shirt1",
X  	"Sienna",
X! 	{ 0,
X  		{ "Sienna", 35, 0 },	/* bottom to top */
X  		{ "Black", 8, 0 },
X  		{ "White", 1, 0 },
X--- 3,9 ----
X  {
X  	"Shirt1",
X  	"Sienna",
X! 	{ 0, {
X  		{ "Sienna", 35, 0 },	/* bottom to top */
X  		{ "Black", 8, 0 },
X  		{ "White", 1, 0 },
X***************
X*** 12,20 ****
X  		{ "LightGrey", 8, 0 },
X  		{ "White", 1, 0 },
X  		{ "LightGrey", 8, 0 },
X! 		{ 0 }
X  	},
X!     	{ 0,
X  		{ "Sienna", 35, 0 },	/* left to right */
X  		{ "LightBlue", 8, 0 },
X  		{ "White", 1, 0 },
X--- 12,20 ----
X  		{ "LightGrey", 8, 0 },
X  		{ "White", 1, 0 },
X  		{ "LightGrey", 8, 0 },
X! 		{ 0 }}
X  	},
X!     	{ 0, {
X  		{ "Sienna", 35, 0 },	/* left to right */
X  		{ "LightBlue", 8, 0 },
X  		{ "White", 1, 0 },
X***************
X*** 23,29 ****
X  		{ "Black", 8, 0 },
X  		{ "White", 1, 0 },
X  		{ "Maroon", 8, 0 },
X! 		{ 0 }
X  	},
X  },
X  
X--- 23,29 ----
X  		{ "Black", 8, 0 },
X  		{ "White", 1, 0 },
X  		{ "Maroon", 8, 0 },
X! 		{ 0 }}
X  	},
X  },
X  
Xdiff -cN ../orig/TIStewart.h ./TIStewart.h
X*** ../orig/TIStewart.h	Wed Jan  3 21:21:13 1990
X--- ./TIStewart.h	Wed Jan  3 21:21:46 1990
X***************
X*** 3,9 ****
X  {
X  	"Stewart_Dress",
X  	"White",
X! 	{ SYM,
X  		{ "White", 18, NOP },	/* background stripe */
X  		{ "Blue", 1, 0 },
X  		{ "Black", 4, 0 },
X--- 3,9 ----
X  {
X  	"Stewart_Dress",
X  	"White",
X! 	{ SYM, {
X  		{ "White", 18, NOP },	/* background stripe */
X  		{ "Blue", 1, 0 },
X  		{ "Black", 4, 0 },
X***************
X*** 16,22 ****
X  		{ "Black", 1, 0 },
X  		{ "Red", 1, 0 },
X  		{ "White", 1, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 16,22 ----
X  		{ "Black", 1, 0 },
X  		{ "Red", 1, 0 },
X  		{ "White", 1, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
X***************
X*** 25,31 ****
X  {
X  	"Stewart_Hunting",
X  	"ForestGreen",
X! 	{ 0,
X  		{ "Red", 1, 0 },
X  		{ "ForestGreen", 7, NOP },
X  		{ "DarkGreen", 3, 0 },
X--- 25,31 ----
X  {
X  	"Stewart_Hunting",
X  	"ForestGreen",
X! 	{ 0, {
X  		{ "Red", 1, 0 },
X  		{ "ForestGreen", 7, NOP },
X  		{ "DarkGreen", 3, 0 },
X***************
X*** 42,48 ****
X  		{ "ForestGreen", 1, NOP },
X  		{ "DarkGreen", 7, 0 },
X  		{ "ForestGreen", 7, NOP },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 42,48 ----
X  		{ "ForestGreen", 1, NOP },
X  		{ "DarkGreen", 7, 0 },
X  		{ "ForestGreen", 7, NOP },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
X***************
X*** 51,57 ****
X  {
X  	"Stewart_Royal",
X  	"Red",
X! 	{ SYM,
X  		{ "Red", 18, NOP },	/* background stripe */
X  		{ "Navy", 1, 0 },
X  		{ "Black", 4, 0 },
X--- 51,57 ----
X  {
X  	"Stewart_Royal",
X  	"Red",
X! 	{ SYM, {
X  		{ "Red", 18, NOP },	/* background stripe */
X  		{ "Navy", 1, 0 },
X  		{ "Black", 4, 0 },
X***************
X*** 64,70 ****
X  		{ "Black", 1, 0 },
X  		{ "Red", 1, 0 },
X  		{ "White", 1, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 64,70 ----
X  		{ "Black", 1, 0 },
X  		{ "Red", 1, 0 },
X  		{ "White", 1, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIUrquhart.h ./TIUrquhart.h
X*** ../orig/TIUrquhart.h	Wed Jan  3 21:21:13 1990
X--- ./TIUrquhart.h	Wed Jan  3 21:21:46 1990
X***************
X*** 3,9 ****
X  {
X  	"Urquhart",
X  	"ForestGreen",
X! 	{ SYM,
X  		{ "Black", 1, 0 },
X  		{ "ForestGreen", 8, NOP },	/* Background */
X  		{ "Black", 8, 0 },
X--- 3,9 ----
X  {
X  	"Urquhart",
X  	"ForestGreen",
X! 	{ SYM, {
X  		{ "Black", 1, 0 },
X  		{ "ForestGreen", 8, NOP },	/* Background */
X  		{ "Black", 8, 0 },
X***************
X*** 13,19 ****
X  		{ "Black", 1, 0 },
X  		{ "Navy", 3, 0 },
X  		{ "Red", 2, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 13,19 ----
X  		{ "Black", 1, 0 },
X  		{ "Navy", 3, 0 },
X  		{ "Red", 2, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/TIUsa.h ./TIUsa.h
X*** ../orig/TIUsa.h	Wed Jan  3 21:21:13 1990
X--- ./TIUsa.h	Wed Jan  3 21:21:46 1990
X***************
X*** 3,20 ****
X  {
X  	"Usa",
X  	"White",
X! 	{ 0,
X  		{ "Red", 4, 0 },
X  		{ "White", 4, 0 },
X  		{ "Blue", 4, 0 },
X! 		{ 0 }
X  	},
X! 	{ 0,
X  		{ "Red", 2, 0 },
X  		{ "White", 2, 0 },
X  		{ "Blue", 2, 0 },
X  		{ "Yellow", 2, 0 },
X! 		{ 0 }
X  	},
X  },
X  
X--- 3,20 ----
X  {
X  	"Usa",
X  	"White",
X! 	{ 0, {
X  		{ "Red", 4, 0 },
X  		{ "White", 4, 0 },
X  		{ "Blue", 4, 0 },
X! 		{ 0 }}
X  	},
X! 	{ 0, {
X  		{ "Red", 2, 0 },
X  		{ "White", 2, 0 },
X  		{ "Blue", 2, 0 },
X  		{ "Yellow", 2, 0 },
X! 		{ 0 }}
X  	},
X  },
X  
Xdiff -cN ../orig/TIWallace.h ./TIWallace.h
X*** ../orig/TIWallace.h	Wed Jan  3 21:21:13 1990
X--- ./TIWallace.h	Wed Jan  3 21:21:46 1990
X***************
X*** 3,14 ****
X  {
X  	"Wallace",
X  	"Black",
X! 	{ SYM,
X  		{ "Black", 1, 0 },
X  		{ "Red", 12, 0 },
X  		{ "Black", 12, 0 },
X  		{ "Yellow", 1, 0 },
X! 		{ 0 }
X  	},
X  	{ HVSAME,
X  	},
X--- 3,14 ----
X  {
X  	"Wallace",
X  	"Black",
X! 	{ SYM, {
X  		{ "Black", 1, 0 },
X  		{ "Red", 12, 0 },
X  		{ "Black", 12, 0 },
X  		{ "Yellow", 1, 0 },
X! 		{ 0 }}
X  	},
X  	{ HVSAME,
X  	},
Xdiff -cN ../orig/patchlevel.h ./patchlevel.h
X*** ../orig/patchlevel.h	Wed Jan  3 21:21:14 1990
X--- ./patchlevel.h	Wed Jan  3 21:21:46 1990
X***************
X*** 1,6 ****
X  /* patchlevel.h - to conform to comp.sources.x protocol
X   */
X  
X! #define VERSION "xtartan version 1.0"
X  
X  /* end */
X--- 1,12 ----
X  /* patchlevel.h - to conform to comp.sources.x protocol
X   */
X  
X! #define VERSION "xtartan version 1.1"
X! 
X! /*
X!  * patch1, version 1.1:
X!  *   add extra braces to TI*.h files to conform to ANSI C;
X!  *   change Imakefile to "ComplexProgramTarget".
X!  */
X  
X  /* end */
END_OF_FILE
if test 22434 -ne `wc -c <'xtartan.patch1'`; then
    echo shar: \"'xtartan.patch1'\" unpacked with wrong size!
fi
# end of 'xtartan.patch1'
fi
echo shar: End of shell archive.
exit 0