- simplify ;)

[packages/Radiance.git] / Radiance-rview-conflict.patch

diff -Nur ray.orig/doc/man/man1/findglare.1 ray/doc/man/man1/findglare.1
--- ray.orig/doc/man/man1/findglare.1	Mon Nov 15 21:58:32 1993
+++ ray/doc/man/man1/findglare.1	Wed Aug 21 22:33:26 2002
@@ -54,7 +54,7 @@
 Note that the picture file must contain correct view specifications,
 as maintained by
 .I rpict(1),
-.I rview(1),
+.I radview(1),
 .I pfilt(1)
 and
 .I pinterp(1).
@@ -112,7 +112,7 @@
 .I ximage(1)
 to decide what this value should be.
 Alternatively, one can use the 't' command within
-.I rview(1).
+.I radview(1).
 The idea is to pick a threshold that is well above the average level
 but smaller than the source areas.
 .PP
@@ -157,4 +157,4 @@
 group at EPFL in Switzerland.
 .SH "SEE ALSO"
 getinfo(1), glare(1), glarendx(1), pfilt(1), rpict(1), rtrace(1),
-rview(1), xglaresrc(1), ximage(1)
+radview(1), xglaresrc(1), ximage(1)
diff -Nur ray.orig/doc/man/man1/genblinds.1 ray/doc/man/man1/genblinds.1
--- ray.orig/doc/man/man1/genblinds.1	Mon Oct 10 21:06:53 1994
+++ ray/doc/man/man1/genblinds.1	Wed Aug 21 22:34:18 2002
@@ -57,4 +57,4 @@
 .SH AUTHOR
 Jean-Louis Scartezzini and Greg Ward
 .SH "SEE ALSO"
-genbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), rview(1), xform(1)
+genbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), radview(1), xform(1)
diff -Nur ray.orig/doc/man/man1/genbox.1 ray/doc/man/man1/genbox.1
--- ray.orig/doc/man/man1/genbox.1	Mon Nov 15 21:58:33 1993
+++ ray/doc/man/man1/genbox.1	Wed Aug 21 22:34:28 2002
@@ -42,4 +42,4 @@
 Because spheres and cylinders are used to construct boxes with
 rounded edges, a transparent box of this type appears quite messy.
 .SH "SEE ALSO"
-genrev(1), gensurf(1), genworm(1), rpict(1), rview(1), xform(1)
+genrev(1), gensurf(1), genworm(1), rpict(1), radview(1), xform(1)
diff -Nur ray.orig/doc/man/man1/genclock.1 ray/doc/man/man1/genclock.1
--- ray.orig/doc/man/man1/genclock.1	Wed Apr  9 23:46:29 1997
+++ ray/doc/man/man1/genclock.1	Wed Aug 21 22:34:36 2002
@@ -54,4 +54,4 @@
 .SH AUTHOR
 Greg Ward
 .SH "SEE ALSO"
-genbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), rview(1), xform(1)
+genbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), radview(1), xform(1)
diff -Nur ray.orig/doc/man/man1/genprism.1 ray/doc/man/man1/genprism.1
--- ray.orig/doc/man/man1/genprism.1	Wed Mar 20 01:33:54 1996
+++ ray/doc/man/man1/genprism.1	Wed Aug 21 22:34:48 2002
@@ -57,4 +57,4 @@
 normals.
 If the normals face inward, the appearance will be bizarre.
 .SH "SEE ALSO"
-genbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), rview(1), xform(1)
+genbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), radview(1), xform(1)
diff -Nur ray.orig/doc/man/man1/genrev.1 ray/doc/man/man1/genrev.1
--- ray.orig/doc/man/man1/genrev.1	Mon Nov 15 21:58:33 1993
+++ ray/doc/man/man1/genrev.1	Wed Aug 21 22:34:56 2002
@@ -57,4 +57,4 @@
 The -s option doesn't modify the surface normal correctly
 for the opposite side.
 .SH "SEE ALSO"
-calc(1), genbox(1), gensurf(1), genworm(1), rpict(1), rview(1), xform(1)
+calc(1), genbox(1), gensurf(1), genworm(1), rpict(1), radview(1), xform(1)
diff -Nur ray.orig/doc/man/man1/gensky.1 ray/doc/man/man1/gensky.1
--- ray.orig/doc/man/man1/gensky.1	Fri Apr 24 19:46:58 1998
+++ ray/doc/man/man1/gensky.1	Wed Aug 21 22:35:03 2002
@@ -97,7 +97,7 @@
 description to use with the
 .I \-av
 option of the RADIANCE rendering programs.
-(See rview(1) and rpict(1).)
+(See radview(1) and rpict(1).)
 This value is the cosine-weighted radiance of the sky in
 watts/steradian/meter2.
 .PP
@@ -227,4 +227,4 @@
 .SH AUTHOR
 Greg Ward
 .SH "SEE ALSO"
-rpict(1), rview(1), xform(1)
+rpict(1), radview(1), xform(1)
diff -Nur ray.orig/doc/man/man1/gensurf.1 ray/doc/man/man1/gensurf.1
--- ray.orig/doc/man/man1/gensurf.1	Mon Nov 15 21:58:33 1993
+++ ray/doc/man/man1/gensurf.1	Wed Aug 21 22:35:10 2002
@@ -95,4 +95,4 @@
 The smoothing operation requires that functions be defined
 beyond the [0,1] boundaries of s and t.
 .SH "SEE ALSO"
-calc(1), genbox(1), genrev(1), genworm(1), rpict(1), rview(1), xform(1)
+calc(1), genbox(1), genrev(1), genworm(1), rpict(1), radview(1), xform(1)
diff -Nur ray.orig/doc/man/man1/genworm.1 ray/doc/man/man1/genworm.1
--- ray.orig/doc/man/man1/genworm.1	Mon Nov 15 21:58:33 1993
+++ ray/doc/man/man1/genworm.1	Wed Aug 21 22:35:19 2002
@@ -46,4 +46,4 @@
 opaque materials should be used with this object.
 Also, a worm cannot double back inside itself without making a mess.
 .SH "SEE ALSO"
-calc(1), genbox(1), genrev(1), gensurf(1), rpict(1), rview(1), xform(1)
+calc(1), genbox(1), genrev(1), gensurf(1), rpict(1), radview(1), xform(1)
diff -Nur ray.orig/doc/man/man1/getinfo.1 ray/doc/man/man1/getinfo.1
--- ray.orig/doc/man/man1/getinfo.1	Fri Jan 15 19:26:44 1999
+++ ray/doc/man/man1/getinfo.1	Wed Aug 21 22:35:26 2002
@@ -47,4 +47,4 @@
 .SH AUTHOR
 Greg Ward
 .SH "SEE ALSO"
-oconv(1), pfilt(1), rhinfo(1), rpict(1), rview(1)
+oconv(1), pfilt(1), rhinfo(1), rpict(1), radview(1)
diff -Nur ray.orig/doc/man/man1/glrad.1 ray/doc/man/man1/glrad.1
--- ray.orig/doc/man/man1/glrad.1	Thu Jun 11 03:48:21 1998
+++ ray/doc/man/man1/glrad.1	Wed Aug 21 22:40:12 2002
@@ -49,7 +49,7 @@
 option of
 .I rpict(1)
 and
-.I rview(1).
+.I radview(1).
 The
 .I \-S
 option turns on full-screen stereo for displays that support it.
@@ -169,4 +169,4 @@
 undefined symbol errors.
 .SH "SEE ALSO"
 chmod(1), getinfo(1), ls(1), objview(1), oconv(1), ps(1), rad(1),
-ranimate(1), rhcopy(1), rholo(1), rpict(1), rtrace(1), rview(1), setmon(1)
+ranimate(1), rhcopy(1), rholo(1), rpict(1), rtrace(1), radview(1), setmon(1)
diff -Nur ray.orig/doc/man/man1/lookamb.1 ray/doc/man/man1/lookamb.1
--- ray.orig/doc/man/man1/lookamb.1	Mon Nov 15 21:58:35 1993
+++ ray/doc/man/man1/lookamb.1	Wed Aug 21 22:35:36 2002
@@ -20,7 +20,7 @@
 .I rpict(1),
 .I rtrace(1),
 or
-.I rview(1).
+.I radview(1).
 The default mode prints the position, direction, level, weight,
 radius, value, position gradient and direction gradient
 for each stored ambient value preceded by a
@@ -56,4 +56,4 @@
 .SH AUTHOR
 Greg Ward
 .SH "SEE ALSO"
-getinfo(1), oconv(1), pfilt(1), pinterp(1), rpict(1), rtrace(1), rview(1)
+getinfo(1), oconv(1), pfilt(1), pinterp(1), rpict(1), rtrace(1), radview(1)
diff -Nur ray.orig/doc/man/man1/mkillum.1 ray/doc/man/man1/mkillum.1
--- ray.orig/doc/man/man1/mkillum.1	Fri Oct  6 19:12:05 1995
+++ ray/doc/man/man1/mkillum.1	Wed Aug 21 22:35:51 2002
@@ -18,7 +18,7 @@
 secondary sources whose contributions can be computed more efficiently by
 .I rpict(1)
 and
-.I rview(1).
+.I radview(1).
 This type of optimization is most useful for windows and skylights which
 represent concentrated sources of indirect illumination.
 .I Mkillum
@@ -188,4 +188,4 @@
 Work on this program was initiated and sponsored by the LESO
 group at EPFL in Switzerland.
 .SH "SEE ALSO"
-oconv(1), rad(1), rpict(1), rtrace(1), rview(1)
+oconv(1), rad(1), rpict(1), rtrace(1), radview(1)
diff -Nur ray.orig/doc/man/man1/objview.1 ray/doc/man/man1/objview.1
--- ray.orig/doc/man/man1/objview.1	Thu Jun 11 03:47:38 1998
+++ ray/doc/man/man1/objview.1	Wed Aug 21 22:36:01 2002
@@ -44,4 +44,4 @@
 .SH AUTHOR
 Greg Ward Larson
 .SH "SEE ALSO"
-glrad(1), oconv(1), rad(1), rview(1)
+glrad(1), oconv(1), rad(1), radview(1)
diff -Nur ray.orig/doc/man/man1/oconv.1 ray/doc/man/man1/oconv.1
--- ray.orig/doc/man/man1/oconv.1	Wed Aug 16 04:19:06 1995
+++ ray/doc/man/man1/oconv.1	Wed Aug 21 22:36:13 2002
@@ -167,4 +167,4 @@
 can be used to automate octree creation and maintenance.
 .SH "SEE ALSO"
 getbbox(1), getinfo(1), make(1), rad(1),
-rpict(1), rview(1), rtrace(1), xform(1)
+rpict(1), radview(1), rtrace(1), xform(1)
diff -Nur ray.orig/doc/man/man1/pinterp.1 ray/doc/man/man1/pinterp.1
--- ray.orig/doc/man/man1/pinterp.1	Wed Jan 24 20:47:40 1996
+++ ray/doc/man/man1/pinterp.1	Wed Aug 21 22:36:50 2002
@@ -31,7 +31,7 @@
 The input picture files must contain correct view specifications, as
 maintained by
 .I rpict(1),
-.I rview(1),
+.I radview(1),
 .I pfilt(1)
 and
 .I pinterp.
@@ -237,4 +237,4 @@
 Greg Ward
 .SH "SEE ALSO"
 getinfo(1), pdfblur(1), pfilt(1), pmblur(1), rpict(1), ranimate(1),
-rtrace(1), rview(1)
+rtrace(1), radview(1)
diff -Nur ray.orig/doc/man/man1/pvalue.1 ray/doc/man/man1/pvalue.1
--- ray.orig/doc/man/man1/pvalue.1	Fri Jan 15 19:07:54 1999
+++ ray/doc/man/man1/pvalue.1	Wed Aug 21 22:36:59 2002
@@ -226,4 +226,4 @@
 the scanline ordering or picture size.
 .SH "SEE ALSO"
 getinfo(1), pcompos(1), pfilt(1), pflip(1),
-protate(1), rpict(1), rtrace(1), rview(1)
+protate(1), rpict(1), rtrace(1), radview(1)
diff -Nur ray.orig/doc/man/man1/rad.1 ray/doc/man/man1/rad.1
--- ray.orig/doc/man/man1/rad.1	Mon Feb  1 18:23:11 1999
+++ ray/doc/man/man1/rad.1	Wed Aug 21 22:37:38 2002
@@ -35,7 +35,7 @@
 .I rpict(1),
 .I pfilt(1),
 and/or
-.I rview(1)
+.I radview(1)
 to render a specific scene.
 Variables in
 .I rfile
@@ -124,7 +124,7 @@
 The
 .I \-o
 option specifies an output device for
-.I rview
+.I radview
 (usually "x11")
 and runs this interactive program instead, using the first view in
 .I rfile
@@ -190,10 +190,10 @@
 It is important to set this variable properly as it is used to
 determine the ambient value.
 An appropriate setting may be discovered by running 
-.I rview
+.I radview
 and noting the exposure given by the "exposure =" command.
 As in
-.I rview
+.I radview
 and
 .I pfilt,
 the exposure setting may be given either as a multiplier or as a
@@ -395,7 +395,7 @@
 values will be stored by
 .I rpict
 or
-.I rview.
+.I radview.
 Although it is not required, an ambient file should be given whenever
 an interreflection calculation is expected.
 This will optimize successive runs and minimize artifacts.
@@ -435,7 +435,7 @@
 This file can later be accessed by
 .I rpict
 or
-.I rview
+.I radview
 in subsequent manual runs using the at-sign ('@') file insert option.
 (Using an "OPTFILE" also reduces the length of the rendering
 command, which improves appearance and may even be necessary on some
@@ -476,7 +476,7 @@
 This variable may be used to specify additional options to
 .I rpict
 or
-.I rview.
+.I radview.
 These options will appear after the options set automatically by
 .I rad,
 and thus will override the default values.
@@ -564,7 +564,7 @@
 Now we can invoke
 .I rad
 to take a look at our scene interactively with
-.I rview:
+.I radview:
 .IP "" .2i
 rad -o x11 sample.rif
 .PP
@@ -573,10 +573,10 @@
 .I oconv
 first to create the octree (assuming it doesn't
 already exist), then
-.I rview
+.I radview
 with a long list of options.
 Let's say that from within
-.I rview,
+.I radview,
 we wrote out the view files "view1.vp" and "view2.vp".
 We could add these to "sample.rif" like so:
 .IP "" .2i
@@ -587,7 +587,7 @@
 .fi
 .PP
 To start
-.I rview
+.I radview
 again using vw2 instead of the default, we use:
 .IP "" .2i
 rad -o x11 -v vw2 sample.rif
@@ -643,4 +643,4 @@
 .SH "SEE ALSO"
 glrad(1), make(1), mkillum(1), objview(1), oconv(1),
 pfilt(1), raddepend(1), ranimate(1),
-rholo(1), rpict(1), rtrace(1), rview(1), touch(1), vgaimage(1), ximage(1)
+rholo(1), rpict(1), rtrace(1), radview(1), touch(1), vgaimage(1), ximage(1)
diff -Nur ray.orig/doc/man/man1/rholo.1 ray/doc/man/man1/rholo.1
--- ray.orig/doc/man/man1/rholo.1	Thu Aug  5 23:55:15 1999
+++ ray/doc/man/man1/rholo.1	Wed Aug 21 22:40:29 2002
@@ -28,10 +28,10 @@
 .I Rholo
 is a program for generating and viewing holodeck files.
 Similar to
-.I rview(1),
+.I radview(1),
 .I rholo
 can compute views interactively, but unlike
-.I rview,
+.I radview,
 it reuses any and all information that was previously computed in
 this or earlier runs using the given holodeck file,
 .I hdkfile.
@@ -624,4 +624,4 @@
 participating media will usually work.
 .SH "SEE ALSO"
 chmod(1), ls(1), ps(1), rad(1), ranimate(1), rhcopy(1), rhinfo(1),
-rhoptimize(1), rhpict(1), rpict(1), rtrace(1), rview(1)
+rhoptimize(1), rhpict(1), rpict(1), rtrace(1), radview(1)
diff -Nur ray.orig/doc/man/man1/rhpict.1 ray/doc/man/man1/rhpict.1
--- ray.orig/doc/man/man1/rhpict.1	Thu Mar 11 01:17:40 1999
+++ ray/doc/man/man1/rhpict.1	Wed Aug 21 22:40:38 2002
@@ -177,7 +177,7 @@
 .BI -vf \ file
 Get view parameters from
 .I file,
-which may be a picture or a file created by rview (with the "view" command).
+which may be a picture or a file created by radview (with the "view" command).
 .TP
 .BI -S \ seqstart
 Instead of generating a single picture based only on the view
@@ -220,4 +220,4 @@
 Greg Ward
 .SH "SEE ALSO"
 getinfo(1), pfilt(1), pinterp(1),
-printf(3), ra_rgbe(1), rholo(1), rpict(1), rview(1)
+printf(3), ra_rgbe(1), rholo(1), rpict(1), radview(1)
diff -Nur ray.orig/doc/man/man1/rpict.1 ray/doc/man/man1/rpict.1
--- ray.orig/doc/man/man1/rpict.1	Fri Feb 26 21:26:39 1999
+++ ray/doc/man/man1/rpict.1	Wed Aug 21 22:38:01 2002
@@ -161,7 +161,7 @@
 .BI -vf \ file
 Get view parameters from
 .I file,
-which may be a picture or a file created by rview (with the "view" command).
+which may be a picture or a file created by radview (with the "view" command).
 .TP
 .BI -x \ res
 Set the maximum x resolution to
@@ -767,4 +767,4 @@
 Greg Ward
 .SH "SEE ALSO"
 getinfo(1), lookamb(1), oconv(1), pfilt(1), pinterp(1), pmblur(1),
-printf(3), ra_rgbe(1), rad(1), rtrace(1), rview(1)
+printf(3), ra_rgbe(1), rad(1), rtrace(1), radview(1)
diff -Nur ray.orig/doc/man/man1/rtrace.1 ray/doc/man/man1/rtrace.1
--- ray.orig/doc/man/man1/rtrace.1	Fri Oct 17 20:48:00 1997
+++ ray/doc/man/man1/rtrace.1	Wed Aug 21 22:38:11 2002
@@ -603,4 +603,4 @@
 Greg Ward
 .SH "SEE ALSO"
 getinfo(1), lookamb(1), oconv(1), pfilt(1), pinterp(1),
-pvalue(1), rpict(1), rview(1), vwrays(1), ximage(1)
+pvalue(1), rpict(1), radview(1), vwrays(1), ximage(1)
diff -Nur ray.orig/doc/man/man1/rview.1 ray/doc/man/man1/rview.1
--- ray.orig/doc/man/man1/rview.1	Thu Feb 15 00:48:41 1996
+++ ray/doc/man/man1/rview.1	Wed Aug 21 22:41:09 2002
@@ -1,9 +1,9 @@
 .\" SCCSid "@(#)rview.1 2.21 2/14/96 LBL"
-.TH RVIEW 1 2/14/96 RADIANCE
+.TH RADVIEW 1 2/14/96 RADIANCE
 .SH NAME
-rview - generate RADIANCE images interactively
+radview - generate RADIANCE images interactively
 .SH SYNOPSIS
-.B rview
+.B radview
 [
 .B "rpict options"
 ][
@@ -21,11 +21,11 @@
 ]
 .B octree
 .br
-.B "rview [ options ] \-defaults"
+.B "radview [ options ] \-defaults"
 .br
-.B "rview \-devices"
+.B "radview \-devices"
 .SH DESCRIPTION
-.I Rview
+.I Radview
 generates RADIANCE images using
 .I octree.
 Options specify the viewing parameters as well as
@@ -50,7 +50,7 @@
 and
 .I \-pa
 options are unnecessary, since
-.I rview
+.I radview
 scales the display image to the specified output device.
 Additionally, the
 .I \-b
@@ -63,28 +63,28 @@
 In the third form, the list of supported output devices
 is displayed.
 .PP
-.I Rview
+.I Radview
 starts rendering the image from the selected viewpoint and
 gradually improves the resolution of the display until
 interrupted by keyboard input.
-.I Rview
+.I Radview
 then issues a prompt (usually ':') and accepts a command
 line from the user.
-.I Rview
+.I Radview
 may also stop its calculation and wait for command input if
 the resolution of the display has reached the resolution of the
 graphics device.
 At this point, it will give the 'done:' prompt and await further
 instructions.
 If
-.I rview
+.I radview
 runs out of memory due to lack of resources to store its computed
 image, it will give the 'out of memory:' prompt.
 At this prompt, the user can save the image, quit, or even restart
 a new image, although this is not generally recommended
 on virtual memory machines for efficiency reasons.
 .PP
-.I Rview
+.I Radview
 is not meant to be a rendering program, and we strongly recommend that
 .I rpict(1)
 be used instead for that purpose.
@@ -92,8 +92,8 @@
 .I rpict(1)
 does not store its image in memory or update any display of its output,
 it is much faster and less wasteful of its resources than
-.I rview.
-.I Rview
+.I radview.
+.I Radview
 is intended as a quick interactive program for deciding viewpoints
 and debugging scene descriptions and is not suited for producing
 polished images.
@@ -180,7 +180,7 @@
 appearing in
 .I rfile).
 If
-.I rview
+.I radview
 was started by
 .I rad,
 then the
diff -Nur ray.orig/doc/man/man1/trad.1 ray/doc/man/man1/trad.1
--- ray.orig/doc/man/man1/trad.1	Tue Aug 12 23:15:59 1997
+++ ray/doc/man/man1/trad.1	Wed Aug 21 22:38:55 2002
@@ -111,4 +111,4 @@
 .I wish
 and Tcl/Tk language by John Ousterhout
 .SH "SEE ALSO"
-oconv(1), pfilt(1), rad(1), rpict(1), rview(1), wish(1), ximage(1)
+oconv(1), pfilt(1), rad(1), rpict(1), radview(1), wish(1), ximage(1)
diff -Nur ray.orig/doc/man/man1/vwright.1 ray/doc/man/man1/vwright.1
--- ray.orig/doc/man/man1/vwright.1	Fri Aug 30 02:32:19 1996
+++ ray/doc/man/man1/vwright.1	Wed Aug 21 22:39:05 2002
@@ -78,4 +78,4 @@
 .SH AUTHOR
 Greg Ward
 .SH "SEE ALSO"
-pdfblur(1), rad(1), rcalc(1), rpict(1), rview(1)
+pdfblur(1), rad(1), rcalc(1), rpict(1), radview(1)
diff -Nur ray.orig/doc/man/man1/xform.1 ray/doc/man/man1/xform.1
--- ray.orig/doc/man/man1/xform.1	Wed Jun 16 19:13:16 1999
+++ ray/doc/man/man1/xform.1	Wed Aug 21 22:39:13 2002
@@ -184,4 +184,4 @@
 .SH BUGS
 Only regular (distortion-free) transformations are allowed.
 .SH "SEE ALSO"
-genbox(1), gensurf(1), oconv(1), replmarks(1), rpict(1), rview(1)
+genbox(1), gensurf(1), oconv(1), replmarks(1), rpict(1), radview(1)
diff -Nur ray.orig/doc/man/man1/ximage.1 ray/doc/man/man1/ximage.1
--- ray.orig/doc/man/man1/ximage.1	Tue Oct 27 18:44:51 1998
+++ ray/doc/man/man1/ximage.1	Wed Aug 21 22:39:23 2002
@@ -239,4 +239,4 @@
 Philip Thompson (MIT)
 .SH "SEE ALSO"
 aedimage(1), normtiff(1), pcond(1), pfilt(1), rpict(1), rtrace(1),
-rview(1), xglaresrc(1), xshowtrace(1)
+radview(1), xglaresrc(1), xshowtrace(1)
diff -Nur ray.orig/doc/man/man1/xshowtrace.1 ray/doc/man/man1/xshowtrace.1
--- ray.orig/doc/man/man1/xshowtrace.1	Mon Nov 15 21:58:47 1993
+++ ray/doc/man/man1/xshowtrace.1	Wed Aug 21 22:39:33 2002
@@ -19,7 +19,7 @@
 The picture should have been created from a previous
 .I rpict(1)
 or
-.I rview(1)
+.I radview(1)
 calculation using the given octree.
 Once the image is displayed, the user can use the 't' command of
 .I ximage
@@ -39,4 +39,4 @@
 .I xshowtrace
 starts drawing rays, the rays will be displaced.
 .SH "SEE ALSO"
-oconv(1), rpict(1), rtrace(1), rview(1), ximage(1)
+oconv(1), rpict(1), rtrace(1), radview(1), ximage(1)
diff -Nur ray.orig/doc/ray.1 ray/doc/ray.1
--- ray.orig/doc/ray.1	Wed Jan 20 23:13:57 1999
+++ ray/doc/ray.1	Wed Aug 21 22:41:38 2002
@@ -45,7 +45,7 @@
 The central program is
 .I rpict,
 which produces a picture from a scene description.
-.I Rview
+.I Radview
 is a variation of
 .I rpict
 that computes and displays images interactively.
@@ -1320,10 +1320,10 @@
 but the octree will serve as input to the ray-tracing
 programs and directs the use of a scene description.
 .PP
-.I Rview
+.I Radview
 is ray-tracing program for viewing a scene interactively.
 When the user specifies a new perspective,
-.I rview
+.I radview
 quickly displays a rough
 image on the terminal, then progressively
 increases the resolution as the user looks on.
diff -Nur ray.orig/doc/tutorial.1 ray/doc/tutorial.1
--- ray.orig/doc/tutorial.1	Thu Jan  2 04:16:19 1997
+++ ray/doc/tutorial.1	Wed Aug 21 22:42:44 2002
@@ -134,7 +134,7 @@
 .LP
 Now that we have a simple scene description, we may look at it with
 the interactive viewing program,
-.B rview.
+.B radview.
 First, however, we must create the "octree"
 file that will be used to accelerate the rendering process.
 To accomplish this, type the following command:
@@ -163,12 +163,12 @@
 where to point its camera.
 To simplify our example, we will use the same starting position for
 all our renderings, and change views only once
-.B rview
+.B radview
 is started:
 .QP
 %
 .I
-rview -vp 2.25 .375 1 -vd -.25 .125 -.125 -av .5 .5 .5 test.oct
+radview -vp 2.25 .375 1 -vd -.25 .125 -.125 -av .5 .5 .5 test.oct
 .R
 .LP
 The "-vp" option gives the view point, and the "-vd" option gives
@@ -176,22 +176,22 @@
 The "-av" option specifies the amount of light globally present
 in the scene, permitting portions of the scene that are not
 illuminated directly to be visible.
-.B Rview
+.B Radview
 has many more options, and their default values may be discovered using:
 .QP
 %
-.I "rview -defaults"
+.I "radview -defaults"
 .LP
 You should start to see an image of a red ball forming on your screen.
 Take this opportunity to try each of
-.B rview's
+.B radview's
 commands, as described in the manual.
 If you make a mistake in a view specification, use the
 .B last
 command to get back to where you were.
 It is probably a good idea to save your favorite view using the following
 command from within
-.B rview:
+.B radview:
 .QP
 :
 .I "view default.vf"
@@ -254,7 +254,7 @@
 .I "oconv room.rad > test.oct"
 .br
 %
-.I "rview -vf default.vf -av  .5  .5  .5  test.oct"
+.I "radview -vf default.vf -av  .5  .5  .5  test.oct"
 .LP
 This is better, but our ball and light source are still floating, which
 is an unrealistic condition for most rooms.
@@ -595,7 +595,7 @@
 Now let's look at our modified scene, using the same command as before:
 .QP
 %
-.I "rview -vf default.vf -av .5 .5 .5 test.oct"
+.I "radview -vf default.vf -av .5 .5 .5 test.oct"
 .LP
 As you look around the scene, you will need to adjust the exposure repeatedly
 to be able to see detail over the wide dynamic range now present.
@@ -611,13 +611,13 @@
 .I "e 1"
 .LP
 All commands in
-.B rview
+.B radview
 can be abbreviated by one or two letters.
 Additional control over the exposure is possible by changing the multiplier
 factor to a value greater than one to lighten or less than one to darken.
 It is also possible to use absolute settings and spot normalization.
 (See the
-.B rview
+.B radview
 manual entry for details.)\0
 .LP
 You may notice that, other than a patch of sun on the floor, the window does
@@ -775,7 +775,7 @@
 # Technically, we could stop here and let rad figure out the rest,
 # but it is very useful to also give an exposure value that is
 # appropriate for this scene.  We may discover this value from within
-# rview using the "e =" command once we have found the exposure level we
+# radview using the "e =" command once we have found the exposure level we
 # like.  For the interior of our space under these particular lighting
 # conditions, an exposure value of 0.5 works well:
 
@@ -794,7 +794,7 @@
 option tells
 .B rad
 to run
-.B rview
+.B radview
 under
 .I X11
 instead of creating pictures (the default action) using
@@ -803,18 +803,18 @@
 substitute the appropriate driver module for
 .I x11.
 To discover what modules are available with your version of
-.B rview,
+.B radview,
 type:
 .QP
 %
-.I "rview -devices"
+.I "radview -devices"
 .LP
 Once started,
 .B rad
 shows us the commands as it executes them, first
 .B oconv
 then
-.B rview.
+.B radview.
 .LP
 Since we didn't specify a view in our control file,
 .B rad
@@ -843,7 +843,7 @@
 Rather than executing another
 .B rad
 command, we can get the same view functionality from within
-.B rview
+.B radview
 using the "L" command.
 (This is a single-letter command, corresponding roughly to the "last"
 command for retrieving views from files, explained earlier.)\0
@@ -854,7 +854,7 @@
 end of the control file for later access and batch rendering.
 For example, you can put the default viewpoint into your control file
 using the
-.B rview
+.B radview
 commands:
 .QP
 :
@@ -868,7 +868,7 @@
 (Shorter view names are better because they end up being part of the
 picture file name, which can get quite long.)\0
 Move around in
-.B rview
+.B radview
 to find a few different views you like, and save them (with sensible names)
 to the control file using the "V" command.
 If you make a mistake and save a view you later decide you dislike, you
@@ -1036,20 +1036,20 @@
 .fi
 .LP
 To look at the scene with
-.B rview,
+.B radview,
 simply run:
 .QP
 %
 .I "rad -o x11 inter.rif"
 .LP
 Probably the first thing you notice after starting
-.B rview
+.B radview
 is that nothing happens.
 It takes the calculation a while to get going, as it must trace
 many rays at the outset to determine the contribution at each
 point from the window area.
 Once
-.B rview
+.B radview
 has stored up some values, the progress rate improves, but it
 never really reaches blistering speed.
 .LP
diff -Nur ray.orig/lib/tcl/trad.hlp ray/lib/tcl/trad.hlp
--- ray.orig/lib/tcl/trad.hlp	Thu Oct 26 22:42:52 2000
+++ ray/lib/tcl/trad.hlp	Wed Aug 21 22:52:19 2002
@@ -487,7 +487,7 @@
 
 There are two basic ways to compute the exposure value.
 The first is by trial and error, where the value is adjusted up and
-down within rview using the "e = value" command.
+down within radview using the "e = value" command.
 Though it sounds flaky, this is the most reliable way to set the
 exposure (and ambient level) in general lighting situations.
 
@@ -545,7 +545,7 @@
 To remove an unwanted view, select it and press the "Delete" button.
 To undo this action, simply press the "Add" button again.
 
-The first view in the list is the default given to rview during
+The first view in the list is the default given to radview during
 interactive rendering, and is the first view rendered in a batch run.
 To change the default view, select the newly desired view and press
 the "Set Default" button.
@@ -614,7 +614,7 @@
 define a view.
 
 The simplest view specification is of the form "-vf viewfile", where
-"viewfile" is a file created with the rview "view" command, or a
+"viewfile" is a file created with the radview "view" command, or a
 Radiance picture.
 This method of naming views, although convenient, is not the best
 since it is difficult to know exactly where such a view is by
@@ -702,7 +702,7 @@
 The "Set Default" button may be used to make the selected view the
 default view for rendering.
 This simply moves the view to the top of the list in the rad input file.
-The default view will be the one normally rendered by rview when rad
+The default view will be the one normally rendered by radview when rad
 is started interactively, and is the first view rendered in a batch
 process.
 
@@ -838,7 +838,7 @@
 minutes) between progress reports.
 
 Other windows allow the user to customize the options to oconv(1),
-mkillum(1), rview(1) and rpict(1), and pfilt(1).
+mkillum(1), radview(1) and rpict(1), and pfilt(1).
 
 .Options.Quality
 
@@ -916,7 +916,7 @@
 
 The "Optfile" setting assigns a file to hold rendering options,
 which may be a convenience when these options are reused for
-rtrace(1) or rpiece(1), or manual invocations of rview or rpict.
+rtrace(1) or rpiece(1), or manual invocations of radview or rpict.
 Using an options file also reduces the size of the command line,
 making it a little easier on the eye.
 
@@ -977,7 +977,7 @@
 .Options.Render
 
 The "render opts" window is used to specify additional options to
-the rview(1) and rpict(1) rendering programs.
+the radview(1) and rpict(1) rendering programs.
 Most of the important parameters are computed by rad, so this
 window is usually used to override specific parameters or to give
 additional information, such as which materials to exclude from the
@@ -1109,7 +1109,7 @@
 The "rview" button on the Action screen starts an interactive
 rendering for the selected view, indicated by the menu button
 just to the right.
-Other views may be accessed within rview using the "L name"
+Other views may be accessed within radview using the "L name"
 command, and new views can be added with the "V name"
 command.
 
@@ -1119,7 +1119,7 @@
 a number later), then use the Views screen to override the previous
 view definition with the new one.
 (See the "View" topic in the current
-help category, the "Change" topic under "Views" and the rview(1)
+help category, the "Change" topic under "Views" and the radview(1)
 manual page for more information.)
 
 If the octree is out-of-date, it will be rebuilt before rendering
@@ -1129,7 +1129,7 @@
 
 The Action screen contains two menus for selecting views.
 The top menu, next to the "rview" button, sets the view to start
-with in rview, and is selected from the current view list.
+with in radview, and is selected from the current view list.
 The second view menu, next to the "Start" button for batch
 rendering, selects the view or views to render in batch mode.
 If the special entry "ALL" is selected, then every view in the
diff -Nur ray.orig/src/rt/Rmakefile ray/src/rt/Rmakefile
--- ray.orig/src/rt/Rmakefile	Wed Aug 21 21:52:29 2002
+++ ray/src/rt/Rmakefile	Wed Aug 21 22:43:22 2002
@@ -85,7 +85,7 @@
 # What this makefile produces:
 #
 
-PROGS = rtrace rpict rview lookamb
+PROGS = rtrace rpict radview lookamb
 
 all:	$(PROGS)
 
@@ -120,8 +120,8 @@
 rpict:	$(RPOBJS)
 	$(CC) $(CFLAGS) -o rpict $(RPOBJS) $(LIBS)
 
-rview:	$(RVOBJS)
-	$(CC) $(CFLAGS) -o rview $(RVOBJS) $(LIBS) $(DLIBS)
+radview:	$(RVOBJS)
+	$(CC) $(CFLAGS) -o radview $(RVOBJS) $(LIBS) $(DLIBS)
 
 lookamb:	lookamb.o ambio.o
 	$(CC) $(CFLAGS) -o lookamb lookamb.o ambio.o $(LIBS)
diff -Nur ray.orig/src/util/rad.c ray/src/util/rad.c
--- ray.orig/src/util/rad.c	Tue Feb  2 17:57:57 1999
+++ ray/src/util/rad.c	Wed Aug 21 22:46:41 2002
@@ -1068,14 +1068,14 @@
 		return;
 	if (sayview)
 		printview(vw);
-	sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname);
+	sprintf(combuf, "radview %s%s%s -R %s ", vw, po, opts, rifname);
 	if (rvdevice != NULL)
 		sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
 	if (vdef(EXPOSURE))
 		sprintf(combuf+strlen(combuf), "-pe %s ", vval(EXPOSURE));
 	strcat(combuf, oct1name);
 	if (runcom(combuf)) {		/* run it */
-		fprintf(stderr, "%s: error running rview\n", progname);
+		fprintf(stderr, "%s: error running radview\n", progname);
 		quit(1);
 	}
 }
diff -Nur ray.orig/src/util/trad.hlp ray/src/util/trad.hlp
--- ray.orig/src/util/trad.hlp	Tue Oct 20 20:52:16 1998
+++ ray/src/util/trad.hlp	Wed Aug 21 22:47:57 2002
@@ -487,7 +487,7 @@
 
 There are two basic ways to compute the exposure value.
 The first is by trial and error, where the value is adjusted up and
-down within rview using the "e = value" command.
+down within radview using the "e = value" command.
 Though it sounds flaky, this is the most reliable way to set the
 exposure (and ambient level) in general lighting situations.
 
@@ -545,7 +545,7 @@
 To remove an unwanted view, select it and press the "Delete" button.
 To undo this action, simply press the "Add" button again.
 
-The first view in the list is the default given to rview during
+The first view in the list is the default given to radview during
 interactive rendering, and is the first view rendered in a batch run.
 To change the default view, select the newly desired view and press
 the "Set Default" button.
@@ -614,7 +614,7 @@
 define a view.
 
 The simplest view specification is of the form "-vf viewfile", where
-"viewfile" is a file created with the rview "view" command, or a
+"viewfile" is a file created with the radview "view" command, or a
 Radiance picture.
 This method of naming views, although convenient, is not the best
 since it is difficult to know exactly where such a view is by
@@ -702,7 +702,7 @@
 The "Set Default" button may be used to make the selected view the
 default view for rendering.
 This simply moves the view to the top of the list in the rad input file.
-The default view will be the one normally rendered by rview when rad
+The default view will be the one normally rendered by radview when rad
 is started interactively, and is the first view rendered in a batch
 process.
 
@@ -838,7 +838,7 @@
 minutes) between progress reports.
 
 Other windows allow the user to customize the options to oconv(1),
-mkillum(1), rview(1) and rpict(1), and pfilt(1).
+mkillum(1), radview(1) and rpict(1), and pfilt(1).
 
 .Options.Quality
 
@@ -916,7 +916,7 @@
 
 The "Optfile" setting assigns a file to hold rendering options,
 which may be a convenience when these options are reused for
-rtrace(1) or rpiece(1), or manual invocations of rview or rpict.
+rtrace(1) or rpiece(1), or manual invocations of radview or rpict.
 Using an options file also reduces the size of the command line,
 making it a little easier on the eye.
 
@@ -977,7 +977,7 @@
 .Options.Render
 
 The "render opts" window is used to specify additional options to
-the rview(1) and rpict(1) rendering programs.
+the radview(1) and rpict(1) rendering programs.
 Most of the important parameters are computed by rad, so this
 window is usually used to override specific parameters or to give
 additional information, such as which materials to exclude from the
@@ -1026,7 +1026,7 @@
 run, usually via rad(1).
 The top row of buttons is used to update the octree following a
 change to one or more input files.
-The "rview" button starts an interactive rendering in the
+The "radview" button starts an interactive rendering in the
 foreground.
 The next set of buttons provides for the control of a batch
 rendering process, taking place in the background.
@@ -1109,7 +1109,7 @@
 The "rview" button on the Action screen starts an interactive
 rendering for the selected view, indicated by the menu button
 just to the right.
-Other views may be accessed within rview using the "L name"
+Other views may be accessed within radview using the "L name"
 command, and new views can be added with the "V name"
 command.
 
@@ -1119,7 +1119,7 @@
 a number later), then use the Views screen to override the previous
 view definition with the new one.
 (See the "View" topic in the current
-help category, the "Change" topic under "Views" and the rview(1)
+help category, the "Change" topic under "Views" and the radview(1)
 manual page for more information.)
 
 If the octree is out-of-date, it will be rebuilt before rendering
@@ -1129,7 +1129,7 @@
 
 The Action screen contains two menus for selecting views.
 The top menu, next to the "rview" button, sets the view to start
-with in rview, and is selected from the current view list.
+with in radview, and is selected from the current view list.
 The second view menu, next to the "Start" button for batch
 rendering, selects the view or views to render in batch mode.
 If the special entry "ALL" is selected, then every view in the