Framebuffer API is (hopefully) close enough for now, so shifting focus to libdm (svn branch delete)

svn:revision:62127 svn:branch:framebuffer-experiment svn:account:starseeker
2014-08-13 18:27:27 +00:00
2342 changed files with 16002 additions and 628579 deletions
@@ -703,13 +703,12 @@ Open Source (GSoC)
 Huff, Emory
 nicknames hknoll
 2013 July
-ARL Student Hire
+U.S. Army Research Laboratory (SEAP)

 Engbert, Jonathan
 nicknames ejno
 2013 July
 Open Source
-ARL Student Hire / University of Maryland, Baltimore County

 Andrew
 2013 November
@@ -748,11 +747,6 @@ Roberts, Mitchell
 2014 July
 ARL Student Hire

-Bayes, Matthew
-nicknames klinger4077
-2014 July
-ARL Student Hire / University of Maryland College Park
-

 SPECIAL THANKS
 --------------
@@ -15,14 +15,6 @@ on-going issues.
 Recent Bugs
 -----------

-* wgl framebuffer is not lingering on windows (regardless of using
-  wgll or default) when it should
-
-* sh_text.c: texture mapping crashes (in txt_render() near line 318)
-  if you specify image dimensions larger than the texture file.  it
-  gets back a mapped file, but indexes directly based on the provided
-  sizes without bounds checking.
-
 * count_non_union_ops() in g-iges crashes with simple conversion case

 * gqa bypasses rt_dirbuild() so it never sets rt_bot_mintie nor uses
@@ -294,7 +294,6 @@ include/vmath.h
 	VSCALE_2D -> V2SCALE [deprecated 7.14]
 	VJOIN1_2D -> V2JOIN1 [deprecated 7.14]
 liborle
-include/orle.h
 	remove liborle and the tools using it, fb-orle, orle-fb, orle-pix and
 	pix-orle [deprecated 7.20]
 mged
@@ -973,10 +972,10 @@ s/bu_find_hash_entry/bu_hash_tbl_find/g
 s/bu_hash_add_entry/bu_hash_tbl_add/g
 s/bu_hash_tbl_pr/bu_hash_tbl_print/g
 	renamed for better consistency in hash table API and with other libbu API [7.24]
-s/dm_applicationfocus\([[:space:]]*\);//g
-	only useful in older os x versions, users can now do the same thing via XQuartz preferences [7.24]
+s/dm_applicationfocus\([[:space:]]\);//g
+	only useful in older os x versions, users can now do the same thing via XQuartz preferences
 s/bu_vls_trunc2/bu_vls_trunc/g
-        removed duplicitous function in favor of more general version [7.24]
+        removed duplicitous function in favor of more general version
 s/bn_pi/M_PI/g
 s/bn_twopi/M_2PI/g
 s/bn_halfpi/M_PI_2/g
@@ -988,17 +987,10 @@ s/bn_inv255/(1.0 \/ 255.0)/g
 s/bn_degtorad/DEG2RAD/g
 s/bn_radtodeg/RAD2DEG/g
 s/bn_sin_scale/(BN_SINTABSIZE \/ M_2PI)/g
-        eliminated a number of libbn globals in favor of existing constants [7.24]
+        eliminated a number of libbn globals in favor of existing constants
 s/(#[[:space:]]*include[[:space:]]+["<])vfont-if\.h/\1bu\/vfont.h/g
 s/(#[[:space:]]*include[[:space:]]+["<])cmd\.h/\1bu\/cmd.h/g
 s/(#[[:space:]]*include[[:space:]]+["<])magic\.h/\1bu\/magic.h/g
        library-specific public headers moved into a subdir [7.24]
 s/([^_])([nh]to[hn][fd])/\1bu_cv_\2/g
        ntohf, ntohd, htonf, htond renamed with bu_cv_ prefix [7.24]
-s/bu_kill_parallel\([[:space:]]*\);//g
-        didn't do anything unless called from forked process, use bu_terminate() [7.24]
-s/bu_jmpbuf/bu_jmpbuf[0]/g
-s/bu_setjmp_valid/bu_setjmp_valid[0]/g
-        can replace 0 with bu_parallel_id() to get thread-safe jumping [7.24]
-s/bu_semaphore_reinit/bu_semaphore_init/g
-        no longer need to manually reinitialize (or initialize) semaphores [7.24]
@@ -1027,7 +1027,15 @@ endif(NOT Qt5Widgets_FOUND AND BRLCAD_ENABLE_QT)
 mark_as_advanced(Qt5Widgets_DIR)

 # Enable features requiring OpenSceneGraph
-option(BRLCAD_ENABLE_OSG "Enable features requiring OpenSceneGraph" ${OPENGL_FOUND})
+option(BRLCAD_ENABLE_OSG "Enable features requiring OpenSceneGraph" OFF)
+mark_as_advanced(BRLCAD_ENABLE_OSG)
+if(BRLCAD_ENABLE_OSG)
+  find_package(OpenSceneGraph 3.2.0 REQUIRED osgText osgViewer)
+  if(NOT OSG_LIBRARY)
+    message("OpenSceneGraph interface requested, but OSG is not found - disabling")
+    set(BRLCAD_ENABLE_OSG OFF)
+  endif(NOT OSG_LIBRARY)
+endif(BRLCAD_ENABLE_OSG)

 #----------------------------------------------------------------------
 # The following are fine-grained options for enabling/disabling compiler
@@ -2056,42 +2064,6 @@ if(WIN32)
    set(asinh 1)
  endif(NOT HAVE_ASINH)

-  CHECK_SYMBOL_EXISTS(isnan "math.h" HAVE_ISNAN)
-  #If we don't have it, need to define it in config_win
-  if(NOT HAVE_ISNAN)
-    set(isnan 1)
-  endif(NOT HAVE_ISNAN)
-
-  CHECK_SYMBOL_EXISTS(isinf "math.h" HAVE_ISINF)
-  #If we don't have it, need to define it in config_win
-  if(NOT HAVE_ISINF)
-    set(isinf 1)
-  endif(NOT HAVE_ISINF)
-
-  CHECK_SYMBOL_EXISTS(rint "math.h" HAVE_RINT)
-  #If we don't have it, need to define it in config_win
-  if(NOT HAVE_RINT)
-    set(rint 1)
-  endif(NOT HAVE_RINT)
-
-  CHECK_SYMBOL_EXISTS(fmax "math.h" HAVE_FMAX)
-  #If we don't have it, need to define it in config_win
-  if(NOT HAVE_FMAX)
-    set(fmax 1)
-  endif(NOT HAVE_FMAX)
-
-  CHECK_SYMBOL_EXISTS(nextafterf "math.h" HAVE_NEXTAFTERF)
-  #If we don't have it, need to define it in config_win
-  if(NOT HAVE_NEXTAFTERF)
-    set(nextafterf 1)
-  endif(NOT HAVE_NEXTAFTERF)
-
-  CHECK_SYMBOL_EXISTS(nextafterl "math.h" HAVE_NEXTAFTERL)
-  #If we don't have it, need to define it in config_win
-  if(NOT HAVE_NEXTAFTERL)
-    set(nextafterl 1)
-  endif(NOT HAVE_NEXTAFTERL)
-
  BRLCAD_FUNCTION_EXISTS(_fseeki64 HAVE__FSEEKI64)
  BRLCAD_FUNCTION_EXISTS(_ftelli64 HAVE__FTELLI64)

@@ -536,16 +536,6 @@ first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
 Aliases:  ENABLE_ZLIB, ENABLE_LIBZ


--- BRLCAD_FREETYPE ---
-
-Option for enabling and disabling compilation of the FreeType
-libraries provided with BRL-CAD's source code.  Default is AUTO, responsive to
-the toplevel BRLCAD_BUNDLED_LIBS option and testing first for a system
-version if BRLCAD_BUNDLED_LIBS is also AUTO.
-
-Aliases:  ENABLE_FREETYPE
-
-
 --- BRLCAD_TERMLIB ---

 Option for enabling and disabling compilation of the termlib library
@@ -713,16 +703,6 @@ AUTO.
 Aliases:  ENABLE_VDS


--- BRLCAD_OSG ---
-
-Option for enabling and disabling compilation of the OpenSceneGraph
-libraries provided with BRL-CAD's source code.  Default is AUTO, responsive to
-the toplevel BRLCAD_BUNDLED_LIBS option and testing first for a system
-version if BRLCAD_BUNDLED_LIBS is also AUTO.
-
-Aliases:  ENABLE_OPENSCENEGRAPH
-
-
 --- BRLCAD_GDIAM ---

 Option for enabling and disabling compilation of the libgdiam approximate
@@ -14,7 +14,6 @@ changes made.  See document footer for additional details.
 --- 2014-XX-XX  Release 7.26.XX                                    ---
 ----------------------------------------------------------------------

-* fixed gdiff crash comparing NURBS entity differences - Sean Morrison
 * fixed pix-ps -S -W -N output size options being ignored - Carl Moore
 * fixed crash exporting mixed mode merged BoT meshes - Sean Morrison
 * fixed submodel primitive crash - Cliff Yapp, Sean Morrison
@@ -18,10 +18,26 @@ tasks as they are completed.
 THESE TASKS SHOULD HAPPEN BEFORE THE NEXT RELEASE
 -------------------------------------------------

+* windows smp support
+
+* make sure we can run db_dirbuild() multiple times without creating
+  duplicate entries.
+
+* create a BRL-CAD .g with all possible object types embedded.  The
+  csgbrep command is a good starting point, but only about half of
+  them.
+
+* fix the bu_semaphore unit test
+
 * fix the bn_poly_sub unit test

 * fix the bu_heap_test_1 unit test (seen on ia32 fbsd)

+* heap unit test needs to actually compare performance against system
+  allocation, not just do some work
+
+* re-do the sh/enumerate.sh script for CMake
+
 * sync tgc/rec shot() behavior, sort results for proper normal.
  inspect t62 grazing with r653,r735 (tgc on an arb8) looking at ae0,0
  and z=1524 (was hit/overlap, now misses).
@@ -30,10 +46,6 @@ THESE TASKS SHOULD HAPPEN BEFORE THE NEXT RELEASE
 THESE TASKS SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS
 -------------------------------------------------------

-* create a BRL-CAD .g with all possible object types embedded.  The
-  csgbrep command is a good starting point, but only about half of
-  them.
-
 * bundle primary rays in rt front end into postage stamps, shoot via
  rt_shootrays(), modify to pass all rays down through the spatial
  partitioning simultaneously
@@ -55,28 +67,6 @@ THESE TASKS SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS
 THESE ARE UNSCHEDULED BACKLOG TASKS
 -----------------------------------

-* need ability to report the smallest feature in a given hierarchy
-  (smallest edge?) and/or largest error in a given boundary model
-  (largest edge gap or distance between two points that should be
-  coincident).
-
-* geometry compiler
-
-* BU_SETJUMP/BU_UNSETJUMP into macros
-
-* convert all calls to BU_SETJUMP/BU_UNSETJUMP into familiar try/catch
-  logic layout using if/else.
-
-* heap unit test needs to actually compare performance against system
-  allocation, not just do some work
-
-* make sure we can run db_dirbuild() multiple times without creating
-  duplicate entries.
-
-* re-do the sh/enumerate.sh script for CMake
-
-* get bu_extern out of bu/parse.h into its own header file.
-
 * geometry symbolic links (hard and soft links)

 * investigate INFINITY spatial partitioning issue.
@@ -588,6 +578,9 @@ THESE ARE UNSCHEDULED BACKLOG TASKS
 * make nreed's new bot cleanup interface update interactively without
  resorting to calls to Tcl_DoOneEvent() down in librt.

+* convert all calls to BU_SETJUMP/BU_UNSETJUMP into familiar try/catch
+  logic layout using if/else.
+
 * bu_cv_optimize() should be using bu_byteorder().

 * render annotated images to the OpenDocument format.  this is
@@ -1029,7 +1022,6 @@ THESE ARE UNSCHEDULED BACKLOG TASKS
  in BRL-CAD (libraries are BSD licensed: http://ngplant.sourceforge.net)


-
 DATABASE MAINTENANCE/ADMINISTRATION
 -----------------------------------

@@ -1085,31 +1077,6 @@ comp.r4 ID 5678 material code 5 LOS 75
    ...
  };

-* evaluate performance of using an SQL/XML store for BRL-CAD geometry,
-  particularly as it pertains to rt_dirbuild() run times on large
-  models and db_lookup() times.
-
-* multiple-representation geometry.  support storing different
-  "versions" of a given combination node, as selectable subtrees where
-  one selectable subtree is always marked active/selected.  the
-  selectable subtrees could generally be entirely different
-  configurations (e.g., different poses) or different geometry
-  structure (e.g., a blast, signature, or lethality version of a given
-  model).  These could be implemented as a modification to the union
-  tree and exposed to the user as a parametric selection on a comb.
-  Something perhaps like this:
-
-  union tree {
-    ...
-    struct tree_representation {
-      uint32_t magic;
-      int tr_op;
-      const char *tr_name;
-      union tree *tr_subtree;
-    } tr_r;
-    ...
-  };
-

 LIBGED
 ------
@@ -126,10 +126,6 @@ do
                                  shift;;
     --disable-libz)                options="$options -DBRLCAD_ZLIB=SYSTEM";
                                  shift;;
-     --enable-freetype)                options="$options -DBRLCAD_FREETYPE=BUNDLED";
-                                  shift;;
-     --disable-freetype)                options="$options -DBRLCAD_FREETYPE=SYSTEM";
-                                  shift;;
     --enable-termlib)                options="$options -DBRLCAD_TERMLIB=BUNDLED";
                                  shift;;
     --disable-termlib)                options="$options -DBRLCAD_TERMLIB=SYSTEM";
@@ -194,10 +190,6 @@ do
                                  shift;;
     --disable-vds)                options="$options -DBRLCAD_VDS=SYSTEM";
                                  shift;;
-     --enable-openscenegraph)                options="$options -DBRLCAD_OSG=BUNDLED";
-                                  shift;;
-     --disable-openscenegraph)                options="$options -DBRLCAD_OSG=SYSTEM";
-                                  shift;;
     --enable-gdiam)                options="$options -DBRLCAD_GDIAM=BUNDLED";
                                  shift;;
     --disable-gdiam)                options="$options -DBRLCAD_GDIAM=SYSTEM";
@@ -62,6 +62,7 @@ set(docbook_man1_EN
  fb-bw.xml
  fb-cmap.xml
  fb-fb.xml
+  fb-orle.xml
  fb-pix.xml
  fb-png.xml
  fb-rle.xml
@@ -126,12 +127,15 @@ set(docbook_man1_EN
  nmg-bot.xml
  nmg-rib.xml
  obj-g.xml
+  orle-fb.xml
+  orle-pix.xml
  patch-g.xml
  pictx.xml
  pix-alias.xml
  pix-bw.xml
  pix-bw3.xml
  pix-fb.xml
+  pix-orle.xml
  pix-png.xml
  pix-ppm.xml
  pix-ps.xml
@@ -32,28 +32,28 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>anim_script</command>
+<para><emphasis remap='I'>Anim_script</emphasis>
 is designed to produce an animation script for the
 animation of the virtual camera or one
 <emphasis remap='I'>brlcad</emphasis>
 object at a time. It is
 complementary to
-<command>tabsub</command>
+<emphasis remap='I'>tabsub</emphasis>
 in that it performs a similar
 function, but with a different philosophy.</para>

 <para>Both
 <command>anim_script</command>
 and
-<command>tabsub</command>
+<emphasis remap='I'>tabsub</emphasis>
 use one row of an animation table to
 produce one frame of an animation script. With
-<command>tabsub</command>,
+<emphasis remap='I'>tabsub,</emphasis>
 the user supplies
 a template file which controls the form of the animation frames. This
 allows the maximum user control, but also requires a good understanding
 of the script format. With
-<command>anim_script</command>,
+<emphasis remap='I'>anim_script,</emphasis>
 the user supplies all the necessary
 information on the command line. The range of possible output scripts is
 limited, but the user does not have to deal directly with the details.
@@ -69,7 +69,7 @@ animated, as it will appear in the output script. For example, if
 "hatch1"
 is a member of "turret" which is a member of "tank" which is one of the
 objects specified on the command line of the call to
-<command>rt</command>,
+<emphasis remap='I'>rt,</emphasis>
 then the objectname "tank/turret/hatch1" or simply "turret/hatch1" would be used to
 animate the hatch. The tank itself would be referred to by the name,
 "/tank". Note that top-level objects should be preceded by a slash.
@@ -130,16 +130,16 @@ representing no orientation change is (0,0,0,1).</para>
 <para>Permuted orientation. This option indicates that transformations defined by
 the quaternions should be applied to an object which has first been placed
 in
-<command>rt</command>'s
+<emphasis remap='I'>rt</emphasis>'s
 default eye orientation. Thus, the identity quaternion represents yawing the
 object 90 degrees to the left and then pitching it 90 degrees downward.
 The quaternions produced by
-<command>mged</command>'s
+<emphasis remap='I'>mged</emphasis>'s
 saveview command and used by
-<command>rt</command>'s
+<emphasis remap='I'>rt</emphasis>'s
 orientation command
 are quaternions of this type. See
-<command>anim_orient</command>
+<emphasis remap='I'>anim_orient</emphasis>
 for more information.</para>
  </listitem>
  </varlistentry>
@@ -29,13 +29,13 @@
 <para>Note:
 <command>anim_sort</command>
 has been preempted in release 5.0 by
-<command>scriptsort</command>,
+<emphasis remap='I'>scriptsort</emphasis>,
 which sorts scripts much faster.</para>

-<para><command>anim_sort</command>
+<para><emphasis remap='I'>Anim_sort</emphasis>
 allows the user to combine several animation scripts
 into a single script suitable for input to
-<command>rt</command>.
+<emphasis remap='I'>rt</emphasis>.
 A convenient way to
 prepare a complicated animation script is to develop each part
 separately and then use
@@ -68,13 +68,13 @@ output.</para>

 <para>Each of the input files to be concatenated is expected to be a
 viable
-<command>rt</command>
+<emphasis remap='I'>rt</emphasis>
 animation script, containing a series of frames of the
 following form:</para>

 <literallayout remap='.nf'>
 start framenumber;
-any number of semi-colon terminated commands for <command>rt</command>;
+any number of semi-colon terminated commands for rt;
 end;
 any number of post-raytracing commands
 </literallayout> <!-- .fi -->
@@ -43,7 +43,7 @@ calculated speed of the object. Various options allow the user to
 control the assumptions on the object's initial and final speeds, and the
 form of the output.</para>

-<para><command>anim_time</command>
+<para><emphasis remap='I'>Anim_time</emphasis>
 is intended to be used in situations where the user knows what key points
 an object should pass through and how long the entire motion should take,
 but doesn't care exactly when the object
@@ -38,8 +38,8 @@ track is linear between the wheels. The exception is that between the
 first and last wheels, any extra track length is taken up in a hanging
 catenary arc.</para>

-<para><command>anim_track</command> requires two input files. The first, referred to above as
-<emphasis remap='I'>wheelfile</emphasis>,
+<para>anim_track requires two input files. The first, referred to above as
+<emphasis remap='B'>wheelfile</emphasis>,
 is a table which
 defines the initial track geometry by describing the wheels around which
 the track is to be wrapped. The first three columns of the table give
@@ -58,7 +58,7 @@ The track is always confined to a plane which has no left to right
 variation; that is, the wheels can be in front of, behind, above, and
 below each other, but may not be to the left or right of each other. If
 the wheel positions specified in
-<emphasis remap='I'>wheelfile</emphasis>
+<emphasis remap='B'>wheelfile</emphasis>
 do not lie in such a plane, then the first wheel defines the plane into
 which all of the other wheels are projected.</para>

@@ -67,9 +67,9 @@ The track segments between wheels are always linear, except for the
 segment between the first and last wheels. If there is any extra track
 length, it is taken up in a catenary arc which hangs down between the
 first and last wheels. Thus if the first wheel in
-<emphasis remap='I'>wheelfile</emphasis>
+<emphasis remap='B'>wheelfile</emphasis>
 should be the top front wheel of the vehicle, and the last wheel in
-<emphasis remap='I'>wheelfile</emphasis>
+<emphasis remap='B'>wheelfile</emphasis>
 should be the top back wheel of the vehicle. Depending on the track
 length mode specified with the
 <option>-l</option>
@@ -78,7 +78,7 @@ option, the catenary segment may or may not appear.</para>
 <para>The second input file required by
 <command>anim_track</command>,
 referred to above as
-<emphasis remap='I'>in.table</emphasis>,
+<emphasis remap='B'>in.table</emphasis>,
 describes the state of the track in every frame of the animation. The
 format of this second file can vary greatly according to the command-line
 options. The first column of the file is ignored, but is expected to
@@ -158,7 +158,7 @@ command for each of the track pads.</para>
 <para>Animate the track wheels. This option takes one argument: a
 slash-separated path to the wheel basename. The number of wheels is
 obtained from the number of lines in the
-<emphasis remap='I'>wheelfile</emphasis>.
+<emphasis remap='B'>wheelfile</emphasis>.
 If there is, for example, a combination named "rwheels" containing 4
 wheels named wheel_0, wheel_1, wheel_2, and wheel_3, then the correct
 argument is:</para>
@@ -205,14 +205,14 @@ roll. The second column through the seventh columns of the
 should contain the position and orientation of the vehicle in every
 frame. The distance that the track should be rolled around the wheels is
 automatically calculated in every frame. If
-<command>anim_script</command>
+<emphasis remap='I'>anim_script</emphasis>
 is being used with the same table to create the animation script for the
 vehicle itself, the
 <option>-b</option>
 and
 <option>-d</option>
 options to
-<command>anim_script</command>
+<emphasis remap='I'>anim_script</emphasis>
 and
 <command>anim_track</command>
 should be the same.</para>
@@ -229,14 +229,14 @@ that the track should be rolled around the wheels is automatically
 calculated in every frame, based on the assumption that the vehicle is
 always steered to face the direction of motion.
 If
-<command>anim_script</command>
+<emphasis remap='I'>anim_script</emphasis>
 is being used with the same table to create the animation script for the
 vehicle itself, the
 <option>-b</option>
 and
 <option>-d</option>
 options to
-<command>anim_script</command>
+<emphasis remap='I'>anim_script</emphasis>
 and
 <command>anim_track</command>
 should be the same.</para>
@@ -348,7 +348,7 @@ animation script. The default is zero.</para>
  <listitem>
 <para>Specify the common radius of all the wheels. In this case, the fourth column
 should be omitted from the
-<emphasis remap='I'>wheelfile</emphasis>.</para>
+<emphasis remap='B'>wheelfile</emphasis>.</para>
  </listitem>
  </varlistentry>
  <varlistentry>
@@ -369,7 +369,7 @@ frame of an animation, the specified frame number would be zero.</para>
 <para>Specify the animation matrix command to apply to the pads. The default
 value is "rarc", meaning that the matrix between the pad and its parent
 is replaced by a new matrix. See the
-<command>anim_script</command>
+<emphasis remap='I'>anim_script</emphasis>
 man page for more information.</para>
  </listitem>
  </varlistentry>
@@ -379,7 +379,7 @@ man page for more information.</para>
 <para>Specify the animation matrix command to apply to the wheels. The default
 value is "lmul", meaning that the new matrix is multiplied onto the left
 of the old matrix between the pad and its parent combination. See the
-<command>anim_script</command>
+<emphasis remap='I'>anim_script</emphasis>
 man page for more information.</para>

  </listitem>
@@ -396,7 +396,7 @@ you obtain the position of the center of
 the tank and its orientation at each time. You also need to obtain the
 position of the each wheel relative to the vehicle center at each time.
 All of this information is placed in
-<emphasis remap='I'>in.table</emphasis>
+<emphasis remap='B'>in.table</emphasis>
 . The model of the tank is stored in
 model.g as a combination named "tank". Its centroid is at the
 point (0,0,1005) and it faces the y-axis. An animation script for the
@@ -422,7 +422,7 @@ long and 5mm thick. Ninety-six instances of the pad are created, with names "rpa
 through "rpad.95", and grouped together in a combination called "rtrack".</para>

 <para>Now, a file called
-<emphasis remap='I'>rwheelfile</emphasis>
+<emphasis remap='B'>rwheelfile</emphasis>
 is created, describing the positions and radii of the four wheels in the
 right track:</para>

@@ -59,7 +59,7 @@ of the wheelbase (from the front axle to the rear axle).</para>
  <varlistentry>
  <term><option>-a#</option></term>
  <listitem>
-<para><command>anim_turn</command>
+<para><emphasis remap='I'>Track</emphasis>
 assumes that the truck should initially be oriented
 along the line defined by the first two positions in the input table.
 Otherwise, the desired initial yaw of the truck can be specified with the
@@ -71,12 +71,12 @@ option.</para>
  <term><option>-r#</option></term>
  <listitem>
 <para>Specify the radii of the front wheels. If this option is selected,
-<command>anim_turn</command>
+<emphasis remap='I'>track</emphasis>
 will create an animation script to animate the front wheels. The output
 table would contain four columns: time, swivel-angle, roll, and a zero
 channel. These represent the orientation of the front wheels, in terms
 of yaw, pitch, and roll, and the table can be piped directly to
-<command>anim_script</command>.</para>
+<emphasis remap='I'>anim_script</emphasis>.</para>
  </listitem>
  </varlistentry>
  <varlistentry>
@@ -85,7 +85,7 @@ of yaw, pitch, and roll, and the table can be piped directly to
 <para>Specify a factor to be used to animate a steering wheel. If this option
 is selected, the output table will contain four columns: time, swivel,
 and two zero columns. This table can be used directly by
-<command>anim_script</command>
+<emphasis remap='I'>anim_script</emphasis>
 to make an animation script for a steering wheel. The argument to the
 option should be the factor by which to exaggerate the swiveling of
 the wheels. For
@@ -106,7 +106,7 @@ frames per second is being created, the user should give an input table
 with a high number of input rows and reduce the output with the
 <option>-p#</option>
 option. For example, if
-<emphasis remap='I'>in.table</emphasis>
+<emphasis remap='B'>in.table</emphasis>
 contains 30 rows for each second of the
 animation, then the command</para>

@@ -25,16 +25,16 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>ap-pix</command>
+<para><emphasis remap='I'>Ap-pix</emphasis>
 converts an
-Applicon
+<emphasis remap='I'>Applicon</emphasis>
 drum plotter image file into a
 <citerefentry><refentrytitle>pix</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 file.</para>

 <para>The
-Applicon
-file is assumed to consist of a number lines each 3456 bits long; the
+<emphasis remap='I'>Applicon</emphasis>
+file is assumed to consist of a number lines each 3456 bits long, the
 resulting
 <emphasis remap='I'>pix</emphasis>
 file thus has scanlines of 3456 pixels.</para>
@@ -23,7 +23,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>asc-nmg</command>
+<para><emphasis remap='I'>asc-nmg</emphasis>
 converts the specified
 <emphasis remap='I'>ascii_file</emphasis>
 (not a .asc geometry database) to a binary BRL-CAD
@@ -88,15 +88,13 @@ l
 	v5	1 -1 1
 </literallayout> <!-- .fi -->

-<para>the command:</para>
+<para>Then, the command:</para>

 <synopsis>
-$ asc-nmg <emphasis remap='I'>ascii_file sample.g</emphasis>
+$ <emphasis remap='I'>asc-nmg ascii_file sample.g</emphasis>
 </synopsis>

-<para>will produce an 'L'-shaped NMG solid to the
-<emphasis remap='I'>sample.g</emphasis>
-database file.</para>
+<para>will produce an 'L'-shaped NMG solid to the sample.g database file.</para>
 </refsect1>

 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
@@ -26,7 +26,7 @@
 and converts it to
 <citerefentry><refentrytitle>plot3</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 format.
-<command>asc-plot3</command>
+<emphasis remap='I'>Asc-plot3</emphasis>
 reads from standard input and writes to standard output
 if file names are not supplied.</para>

@@ -24,9 +24,9 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><emphasis remap='B'><command>asc2g</command></emphasis> is a utility provided by BRL-CAD used to convert <emphasis remap='I'><command>mged(1)</command></emphasis> geometry databases in ASCII form outputted by <emphasis remap='I'><command>g2asc(1)</command></emphasis> to the new binary format. The utility will always create the new binary format, but it will accept either of the two ASCII formats (see <emphasis remap='B'>HISTORY</emphasis>).</para>
+<para><emphasis remap='B'><command>asc2g</command></emphasis> is a utility provided by BRL-CAD used to convert <emphasis remap='I'><command>mged(1)</command></emphasis> geometry databases in ASCII form outputted by <emphasis remap='I'><command>g2asc(1)</command></emphasis> to the new binary format. The utility will always create the new binary format, but it will accept either of the two ASCII formats (See <emphasis remap='B'>HISTORY</emphasis>).</para>

-<para>The local machine binary representation of a mged database is inherently non-portable. <emphasis remap='I'><command>asc2g</command></emphasis> and its converse, <emphasis remap='I'><command>g2asc</command></emphasis> , are simple filters which convert between the binary form and an ASCII representation.</para>
+<para>The local machine binary representation of a mged database is inherently non-portable. <emphasis remap='I'><command>asc2g</command></emphasis>, along with its converse <emphasis remap='I'><command>g2asc</command></emphasis> are simple filters which convert between the binary form and an ASCII representation.</para>

 <para>This was traditionally performed so the files could be transferred to another machine in a portable format.  Although no longer necessary for the current binary geometry database files that  are  created by  mged  ("v5"  format), the conversion process is still necessary if manipulating older ("v4" format) geometry database files.</para>

@@ -36,17 +36,17 @@
 <refsect1 xml:id='examples'><title>EXAMPLE</title>
 <para><emphasis remap='B'><command>g2asc</command></emphasis> <emphasis remap='I'>file.g file.asc</emphasis></para>
  <blockquote remap='RS'>
-  <para>On the local machine, convert the mged databases to ASCII using <emphasis remap='I'><command>g2asc</command></emphasis> .
+  <para>On the local machine, convert the mged databases to ASCII using <emphasis remap='I'><command>g2asc</command></emphasis>
  </para></blockquote> <!-- remap='RE' -->

 <para>scp <emphasis remap='I'>file.asc</emphasis> remote:<emphasis remap='I'>file.asc</emphasis></para>
 <blockquote remap='RS'>
-  <para>Transfer the converted databases to the remote machine.
+  <para>Transfer the converted databases to the remote machine
  </para></blockquote> <!-- remap='RE' -->

 <para>ssh remote "<emphasis remap='B'><command>asc2g</command></emphasis> <emphasis remap='I'>file.asc file.g</emphasis>"</para>
  <blockquote remap='RS'>
-  <para>On the remote machine, convert the files back to the binary representation for that machine using <emphasis remap='I'><command>asc2g</command></emphasis> .
+  <para>On the remote machine, convert the files back to the binary representation for that machine using <emphasis remap='I'><command>asc2g</command></emphasis>
  </para></blockquote> <!-- remap='RE' -->

 </refsect1>
@@ -105,6 +105,6 @@


 <refsect1 xml:id='disclaimer'><title>DISCLAIMER</title>
-<para>The ASCII representation of BRL-CAD geometry databases is not a fixed format and is allowed to change without deprecation notice. In general, this will not occur any more frequently than the binary geometry database format changes, though both are open specifications. Regardless, the ASCII representation is subject to change without notice and should not be relied upon by external codes. (See <emphasis remap='B'>HISTORY</emphasis>.)</para>
+<para>The ASCII representation of BRL-CAD geometry databases is not a fixed format and is allowed to change without deprecation notice. In general, this will not occur any more frequently than the binary geometry database format changes, though both are open specifications. Regardless, the ASCII representation is subject to change without notice and should not be relied upon by external codes. (See <emphasis remap='B'>HISTORY</emphasis>).</para>
 </refsect1>
 </refentry>
@@ -23,7 +23,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>azel</command>
+<para><emphasis remap='I'>Azel</emphasis>
 converts between right-handed Cartesian coordinate systems,
 an application-geometry system
 <emphasis remap='I'>x</emphasis>, <emphasis remap='I'>y</emphasis>, <emphasis remap='I'>z</emphasis>
@@ -76,9 +76,9 @@ Default is 0.</para>
  <term><option>-c</option><replaceable> celsiz</replaceable></term>
  <listitem>
 <para>Specifies a cell size of
-<emphasis remap='I'>celsiz</emphasis>.
+<emphasis remap='I'>celsiz.</emphasis>
 Output vectors are scalar multiplied by
-1/<emphasis remap='I'>celsiz</emphasis>.
+1/<emphasis remap='I'>celsiz.</emphasis>
 Default is 1.
 Useful with the
 <option>-r</option>
@@ -23,7 +23,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>bary</command>
+<para><emphasis remap='I'>Bary</emphasis>
 computes weighted sums of a set of sites in Euclidean 3-space,
 writing them on the standard output.
 The site weights are read from
@@ -76,7 +76,7 @@ the unit type specified).</para>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ bot_dump  -o <emphasis remap='I'>some_bot_dump.dxf</emphasis>  -t <emphasis remap='I'>dxf  sample.g  some_bot</emphasis>
+$ <emphasis remap='I'>bot_dump  -o some_bot_dump.dxf  -t dxf  sample.g  some_bot</emphasis>
 </synopsis>
 </refsect1>

@@ -66,7 +66,7 @@ only be useful for developers.</para>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ bot_shell-vtk  -o <emphasis remap='I'>output.vtk  sample.g  the_exterior</emphasis>
+$ <emphasis remap='I'>bot_shell-vtk  -o output.vtk  sample.g  the_exterior</emphasis>
 </synopsis>
 </refsect1>

@@ -22,10 +22,10 @@
    <refsect1 xml:id="description">
        <title>DESCRIPTION</title>
        <para><command>brep_simple</command> constructs a simple b-rep twisted cube directly using the
-        openNURBS API. The constructed twisted cube is written to a geometry database
-        (brep_simple.g) using the wdb interface. The cube is constructed by first
+        openNURBS API. The constructed twisted cube is written to a geometry database,
+        <emphasis remap="I">brep_simple.g</emphasis> using the wdb interface. The cube is constructed by first
        defining and creating the vertices, then the twisted edges (using trimming
-        curves), and finally the faces to get a final topology like the following:</para>
+        curves), and finally the faces to get a final topology like the following --</para>
        <literallayout remap=".nf">

                       H-------e6-------G
@@ -78,11 +78,11 @@ creating a program that refers to <emphasis remap='I'>BRL-CAD</emphasis> headers
 </refsect1>

 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
-<para><citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>libbu</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>libbn</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>librt</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>libwdb</refentrytitle><manvolnum>3</manvolnum></citerefentry></para>
+<para><citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>libbu</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>libbn</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>librt</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>libwdb</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
 </refsect1>

 <refsect1 xml:id='bugs'><title>BUGS</title>
-<para>No bugs known for <command>brlcad-config</command> .</para>
+<para>No bugs known for <command>brlcad-config</command>.</para>
 </refsect1>

 <refsect1 xml:id='author'><title>AUTHOR</title>
@@ -26,9 +26,9 @@ combinatorial solid geometry (CSG)
 models.
 See
 <citerefentry><refentrytitle>mged</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-and see also
+and
 <emphasis remap='I'>Understanding the Preparation and Analysis of Solid Models</emphasis>
-by Michael John Muuss (enclosed, in the "paper" directory).</para>
+by Michael John Muuss (enclosed, in the "paper") directory.</para>
  </listitem>
  </varlistentry>
  <varlistentry>
@@ -263,7 +263,7 @@ When a local display device is being specified, the
 <emphasis remap='I'>hostname</emphasis>
 should not be specified, for performance reasons; just the
 special string
-<emphasis remap='I'>device_name</emphasis>
+<emphasis remap='I'>Device_name</emphasis>
 is used to select a particular type of framebuffer.
 <emphasis remap='I'>Num</emphasis>
 is type dependent and can either mean a display number or select
@@ -273,7 +273,7 @@ disk file via the remote interface.</para>

 <para>If
 <envar>FB_FILE</envar>
-is not set, the default for your system will be used.</para>
+is not set, the default for you system will be used.</para>

 <para>The use of
 <filename>/dev/</filename>
@@ -22,7 +22,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>buffer</command>
+<para><emphasis remap='I'>Buffer</emphasis>
 is intended to be use as part of a complex pipeline.
 It serves somewhat the same purpose as the Prolog "cut" operator.
 Data from stdin is read and buffered until EOF is detected, and then
@@ -35,9 +35,9 @@ This can also be useful when processing data from and to the
 same framebuffer with a pipeline, without interfering.</para>
 </refsect1>

-<refsect1 xml:id='examples'><title>EXAMPLE</title>
+<refsect1 xml:id='examples'><title>EXAMPLES</title>
 <literallayout remap='.nf'>
-(munch | crunch | buffer | grind | package)
+munch | crunch | buffer | grind | package

 fb-pix | pixfilter -flo | buffer | pix-fb
 </literallayout> <!-- .fi -->
@@ -30,7 +30,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>bw-imp</command>
+<para><emphasis remap='I'>Bw-imp</emphasis>
 converts an 8-bit monochrome
 <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 format
@@ -76,7 +76,7 @@ produce the image roughly centered on the page.</para>
 </refsect1>

 <refsect1 xml:id='caveats'><title>CAVEATS</title>
-<para><command>bw-imp</command>
+<para><emphasis remap='I'>Bw-imp</emphasis>
 will take several CPU-minutes (on a VAX 780) to convert a single
 <emphasis remap='I'>file</emphasis>.</para>
 </refsect1>
@@ -84,11 +84,11 @@ will take several CPU-minutes (on a VAX 780) to convert a single
 <refsect1 xml:id='examples'><title>EXAMPLES</title>
 <para>The following invocations are fairly typical:</para>
 <literallayout remap='RS'>
-pix-bw  -ntsc  <emphasis remap='I'>image.pix</emphasis>  |  bw-imp  |   qpr  -qi300  &amp;
+<emphasis remap='I'>pix-bw  -ntsc  image.pix  |  bw-imp  |   qpr  -qi300</emphasis>  &amp;
 </literallayout> <!-- remap='RE' -->

 <literallayout remap='RS'>
-rle-pix  <emphasis remap='I'>image.rle</emphasis>  |  pix-bw  -ntsc  |  bw-imp  |  qpr  -qi300  &amp;
+<emphasis remap='I'>rle-pix  image.rle  |  pix-bw  -ntsc  |  bw-imp  |  qpr  -qi300</emphasis>  &amp;
 </literallayout> <!-- remap='RE' -->

 <para>The X and Y options in the bw-imp command below are to approximately
@@ -98,17 +98,18 @@ As of release 4.0 the default margins on an output page resulting from
 a bw-imp usage are smaller.  This allows a larger image to be printed
 on one page.</para>
 <literallayout remap='RS'>
-rle-pix  <emphasis remap='I'>image.rle</emphasis>  |  pix-bw  -ntsc  |  bw-imp -X 200 -Y 800  |  ipr -L impress -q i300
+<emphasis remap='I'>rle-pix  image.rle  |  pix-bw  -ntsc  |  bw-imp -X 200 -Y 800  |  ipr -L impress -q i300 </emphasis>
 </literallayout> <!-- remap='RE' -->

 <para>To threshold and invert the black/white sense of a pix file, use:</para>
-<literallayout remap='RS'>
-bwmod  -m  -8  -a  255  <emphasis remap='I'>image.pix</emphasis>  |  pix-bw  |  bw-imp  -t1  | ttcp  -t  -p35  <emphasis remap='I'>printhost</emphasis>
-</literallayout><!-- remap='RE' -->
+  <blockquote remap='RS'>
+<para><emphasis remap='I'>bwmod  -m  -8  -a  255  image.pix  |  pix-bw  |  bw-imp  -t1  |
+ ttcp  -t  -p35 printhost </emphasis>
+  </para></blockquote> <!-- remap='RE' -->

 <para>To use the halftone package:</para>
 <literallayout remap='RS'>
-pix-bw  -ntsc  <emphasis remap='I'>image.pix</emphasis>  |  halftone  |  bw-imp  |   qpr  -qi300 &amp;
+<emphasis remap='I'>pix-bw  -ntsc  image.pix  |  halftone  |  bw-imp  |   qpr  -qi300</emphasis> &amp;
 </literallayout> <!-- remap='RE' -->
 </refsect1>

@@ -31,7 +31,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>bw-pix</command>
+<para><emphasis remap='I'>Bw-pix</emphasis>
 converts a black and white
 <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 format
@@ -47,7 +47,7 @@ is given.</para>
 </refsect1>

 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
-<para><citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>pix-bw</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>pix-bw3</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>pix</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry></para>
+<para><citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>pix-bw</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>pix-bw3</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>pix</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>

 </refsect1>

@@ -34,7 +34,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>bw-ps</command>
+<para><emphasis remap='I'>Bw-ps</emphasis>
 will take a black and white
 <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 format file of given dimensions and produce a Postscript file
@@ -68,20 +68,20 @@ selects landscape mode, i.e. rotates the output image by ninety degrees.</para>
 </refsect1>

 <refsect1 xml:id='examples'><title>EXAMPLES</title>
-<para>bw-ps -c <emphasis remap="I">image.bw</emphasis> &gt; <emphasis remap="I">image.ps</emphasis></para>
+<para>bw-ps -c image.bw &gt; image.ps</para>

-<para>Produces a 6.75 inch PostScript file from an 512 x 512 input image
+<para>Produces a 6.75 inch PostScript file from an 512 x512 input image
 and centers it on an 8.5 x 11 inch page.</para>


-<para>bw-ps -e -w 1024 -n 768 <emphasis remap="I">image.bw</emphasis> &gt; <emphasis remap="I">image.ps</emphasis></para>
+<para>bw-ps -e -w 1024 -n 768 image.bw &gt; image.ps</para>

 <para>Takes the file image.bw which has the dimensions of 1024 pixels wide
 by 768 pixels high, and produces an Encapsulated Postscript version
 of it.</para>


-<para>bw-ps -L -c -S 5.2 &lt; <emphasis remap="I">image.bw</emphasis> &gt; <emphasis remap="I">image.px</emphasis></para>
+<para>bw-ps -L -c -W 5.2 &lt; image.bw &gt; image.ps</para>

 <para>Makes a PostScript file of the (assumed 512 square) image, with
 the output image 5.2 inches square, in landscape mode, centered
@@ -59,7 +59,7 @@ as a decimal number in the range of 0 to 255.</para>
        </listitem>
      </varlistentry>
      <varlistentry>
-        <term><option>-s</option> <replaceable>square_file_size</replaceable></term>
+        <term><option>-s</option> <replaceable>squarefilesize</replaceable></term>
        <listitem>
          <para>sets the saved image width and height to the indicated
          value.</para>
@@ -82,12 +82,12 @@ as a decimal number in the range of 0 to 255.</para>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <literallayout remap='RS'>
-bw-rle  <emphasis remap='I'>tank.bw  tank.rle</emphasis>
+<emphasis remap='I'> bw-rle  tank.bw   tank.rle</emphasis>
 </literallayout> <!-- remap='RE' -->
 </refsect1>

 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
-<para><citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>fb-rle</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>rle-fb</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bw-fb</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bw-pix</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>rle-pix</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry></para>
+<para><citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>fb-rle</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>rle-fb</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bw-fb</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bw-pix</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>rle-pix</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
 </refsect1>

 <refsect1 xml:id='author'><title>AUTHOR</title>
@@ -40,11 +40,11 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>bwcrop</command>
+<para><emphasis remap='I'>Bwcrop</emphasis>
 crops any quadrilateral out of an arbitrarily large
 <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 input file
-(<emphasis remap='I'>in.bw</emphasis>),
+(<emphasis remap='I'>in.bw</emphasis>)<emphasis remap='I'>,</emphasis>
 squares that region to a given height and width output size,
 and writes the result to
 <emphasis remap='I'>out.bw</emphasis>.
@@ -62,7 +62,7 @@ interpolation is done by this program.</para>
 </refsect1>

 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
-<para><citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bwrect</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bwscale</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry></para>
+<para><citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bwrect</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bwscale</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
 </refsect1>

 <refsect1 xml:id='author'><title>AUTHOR</title>
@@ -26,7 +26,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>bwdiff</command>
+<para><emphasis remap='I'>Bwdiff</emphasis>
 compares two black and white
 <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 format files in one of several ways,
@@ -72,16 +72,16 @@ This mode is useful for producing masks
 showing pixels which satisfy the given condition.
 The default background is black, unless the
 <option>-b</option>
-option is specified, is which case the background is
-<emphasis remap='I'>file1</emphasis>, with a
+option is specified, is which case the background is file1, with a
 lowered intensity.</para>

-<para><command>bwdiff</command>
+<para><emphasis remap='I'>Bwdiff</emphasis>
 accepts
 ``<option>-</option>''
 as a synonym for stdin, and
 ``<literal>.</literal>''
-as a synonym for /dev/null .</para>
+as a synonym for
+/<emphasis remap='I'>dev</emphasis>/<emphasis remap='I'>null</emphasis>.</para>

 <para>Note that this program also produces useful results on
 color
@@ -93,13 +93,13 @@ files.</para>
 <para>Suppose you ran
 <citerefentry><refentrytitle>pixstat</refentrytitle><manvolnum>1</manvolnum></citerefentry>
 on a file and found the modes to be red=107, green=93, blue=70.
-You could display those pixels whose colors are at these values by:</para>
-<para>
-gencolor 107 93 70 | bwdiff -e <emphasis remap='I'>file.pix</emphasis> - | pix-fb</para>
+You could display those pixels whose colors are at these values by:
+<!-- .br -->
+<emphasis remap='I'>gencolor 107 93 70 | bwdiff -e file.pix - | pix-fb</emphasis></para>
 </refsect1>

 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
-<para><citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>pixdiff</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bwstat</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>pix</refentrytitle><manvolnum>5</manvolnum></citerefentry></para>
+<para><citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>pixdiff</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bwstat</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>pix</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>

 </refsect1>

@@ -33,7 +33,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>bwfilter</command>
+<para><emphasis remap='I'>Bwfilter</emphasis>
 applies one of several 3x3 kernel filters to a black and white
 <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 format file.
@@ -102,7 +102,7 @@ a laplacian for example is "centered" about zero, thus it
 adds 128 to the answer to yield a difference from neutral grey.
 The
 <option>-O</option>
-flag can be used to change this offset.</para>
+flag can bw used to change this offset.</para>

 <para>The
 <option>-v</option>
@@ -114,7 +114,7 @@ flag displays the max and minimum values and the kernel information on standard
 </refsect1>

 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
-<para><citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bwscale</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry></para>
+<para><citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bwscale</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>

 </refsect1>

@@ -24,7 +24,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>bwhist</command>
+<para><emphasis remap='I'>Bwhist</emphasis>
 displays a histogram of the pixel values in a
 <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 format file.  If a file is not given, standard input is read.
@@ -26,13 +26,13 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>bwhisteq</command>
+<para><emphasis remap='I'>Bwhisteq</emphasis>
 automatically equalizes the histogram of a black and white
 <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 format file.
 It reads the file
 <emphasis remap='I'>file.bw</emphasis>
-and writes a "remapped" version of it on standard output.
+and writes a "remapped" version of it on its standard output.
 The method used is to distribute the values of the histogram, as
 best as possible, in order to
 produce a constant average "density",
@@ -27,7 +27,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>bwmod</command>
+<para><emphasis remap='I'>Bwmod</emphasis>
 will perform a series of arithmetic operations on each 8-bit pixel
 of its input/output stream.  This is a
 <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>
@@ -38,31 +38,9 @@
 extracts a rectangular region from a black and white
 <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 format file. The default input image size is 512x512.
-The x,y coordinates of the origin (the default xorig=0, yorig=0 corresponds to the
-lower left corner) are passed as
+The x,y coordinates of the origin (the defaults xorig=0, yorig=0 correspond to the
+lower left corner) and the dimension of the output image are passed as
 command line arguments.</para>
-
-<para>The
-<option>-w </option><replaceable>file_width</replaceable>
-flag specifies the width of each scanline in the input file, in pixels.
-<option>-W </option><replaceable>scr_width</replaceable>
-does the same for the display device.</para>
-
-<para>The
-<option>-n </option><replaceable>file_height</replaceable>
-and
-<option>-N </option><replaceable>scr_height</replaceable>
-flags specifies the height in scanlines of the input file or display device
-respectively.</para>
-
-<para><option>-s </option><replaceable>squarefilesize</replaceable>
-and
-<option>-S </option><replaceable>squarescrsize</replaceable>
-set both the height and width to the size given (for input file and display device respectively).</para>
-
-<para><option>-o </option><replaceable>out_file.bw</replaceable> is a way of specifying output
-file name.</para>
-
 <para>This utility supports pipes and can read/write from/to them.
 </para>
 </refsect1>
@@ -36,6 +36,7 @@

  <para>
    <command>bwscale</command>
+    <emphasis remap="I">Bwscale</emphasis>
    will take a black and white
    <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>
    format file of given dimensions and produce a larger or smaller
@@ -30,7 +30,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>bwshrink</command>
+<para><emphasis remap='I'>Bwshrink</emphasis>
 will take a black and white
 <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 format file of given dimensions and produce a smaller
@@ -52,15 +52,15 @@ and then scales the image down
 to 1/factor the original size in both dimensions.</para>


-<para>By default, <command>bwshrink</command> uses boxcar averaging to produce the output pixels from
+<para>By default, bwshrink uses boxcar averaging to produce the output pixels from
 the input.  The
 <option>-u</option>
-option causes <command>bwshrink</command> to use image undersampling instead.</para>
+option causes bwshrink to use image undersampling instead.</para>

 </refsect1>

 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
-<para><citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bwcrop</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bwrect</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bwscale</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry></para>
+<para><citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bwcrop</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bwrect</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bwscale</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
 </refsect1>

 <refsect1 xml:id='bugs'><title>BUGS</title>
@@ -24,7 +24,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>bwstat</command>
+<para><emphasis remap='I'>Bwstat</emphasis>
 will take the given
 <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 format file,
@@ -34,19 +34,19 @@ related to the pixel intensities is produced.
 These include:
 <!-- .br -->
 The number of pixels (and the square root of this which is the
-file dimensions if square);
+file dimensions if square).
 <!-- .br -->
-the max and min values;
+The max and min values.
 <!-- .br -->
-the mean;
+The mean.
 <!-- .br -->
-the median (dividing line where half the pixels are above this
-value, half below);
+The median (dividing line where half the pixels are above this
+value, half below).
 <!-- .br -->
-the mode (most frequently occurring value) and the number of pixels
-at this value;
+The mode (most frequently occurring value) and the number of pixels
+at this value.
 <!-- .br -->
-the variance, standard deviation, and skew.</para>
+The variance, standard deviation, and skew.</para>

 <para>The
 <option>-v</option>
@@ -25,24 +25,24 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>bwthresh</command>
+<para><emphasis remap='I'>Bwthresh</emphasis>
 reads from standard input a stream of black-and-white data in
 <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 format
 and thresholds it among the
-<emphasis remap='I'>val</emphasis>s,
+<emphasis remap='I'>vals,</emphasis>
 writing the resulting
 <citerefentry><refentrytitle>bw</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 data to standard output.
 The
-<emphasis remap='I'>val</emphasis>s
+<emphasis remap='I'>vals</emphasis>
 must appear on the command line in strictly increasing order.</para>

 <para>The grey scale 0..255 is divided evenly into
 <emphasis remap='I'>n</emphasis>+1
 bins,
 and each pixel of input is compared to the
-<emphasis remap='I'>val</emphasis>s,
+<emphasis remap='I'>vals,</emphasis>
 to determine which of the
 <emphasis remap='I'>n</emphasis>+1
 grey levels should be output.</para>
@@ -52,7 +52,7 @@ grey levels should be output.</para>
 <para>The command</para>

 <!-- .in +5 -->
-<para>bwthresh 37 143 &lt; <emphasis remap='I'>file.bw</emphasis> &gt; <emphasis remap='I'>file2.bw</emphasis></para>
+<para><emphasis remap='I'>bwthresh 37 143 &lt; file.bw &gt; file2.bw</emphasis></para>
 <!-- .in &bsol;-5 -->

 <para>performs the following mapping:</para>
@@ -26,7 +26,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>cad_boundp</command>
+<para><emphasis remap='I'>cad_boundp</emphasis>
 reads from
 <emphasis remap='I'>input</emphasis>
 (standard input if not specified)
@@ -57,7 +57,7 @@ the output will consist of
 line segment data
 suitable for input into
 another invocation of
-<command>cad_boundp</command> .</para>
+<emphasis remap='I'>cad_boundp</emphasis>.</para>

 <para>Input lines not beginning with a number
 are silently skipped.
@@ -86,7 +86,7 @@ erroneous results.</para>
 </refsect1>

 <refsect1 xml:id='restrictions'><title>RESTRICTIONS</title>
-<para><command>cad_boundp</command>
+<para><emphasis remap='I'>cad_boundp</emphasis>
 may output a polygon
 smaller than desired
 or produce a
@@ -115,9 +115,9 @@ disjoint parts.</para>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
  <blockquote remap='RS'>
-<para>$ cad_boundp -t 0.1
+<para>$ <emphasis remap='I'>cad_boundp -t 0.1
 <!-- .br -->
-# <emphasis remap='I'>comment</emphasis>
+# comment
 <!-- .br -->
 0 2 0 1
 <!-- .br -->
@@ -139,7 +139,6 @@ disjoint parts.</para>
 <!-- .br -->
 0 1 3 1
 <!-- .br -->
-<emphasis remap='I'>
 ^D</emphasis>
 <!-- .br -->
 1 0
@@ -165,12 +164,12 @@ disjoint parts.</para>
 </refsect1>

 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
-<para><citerefentry><refentrytitle>cad_parea</refentrytitle><manvolnum>1</manvolnum></citerefentry></para>
+<para><citerefentry><refentrytitle>cad_parea</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
 </refsect1>

 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
 <para>Any error condition causes
-<command>cad_boundp</command>
+<emphasis remap='I'>cad_boundp</emphasis>
 to terminate
 with non-zero exit status
 after it prints an error message
@@ -184,12 +183,12 @@ produces an appropriate message.</para>
 having only one line segment
 connected to it
 is found on the perimeter,
-<command>cad_boundp</command>
+<emphasis remap='I'>cad_boundp</emphasis>
 produces the message
 "degenerate input".</para>

 <para>If there is too much data for
-<command>cad_boundp</command>
+<emphasis remap='I'>cad_boundp</emphasis>
 to handle,
 the message
 "out of memory"
@@ -24,7 +24,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>cad_parea</command>
+<para><emphasis remap='I'>cad_parea</emphasis>
 reads from
 <emphasis remap='I'>input</emphasis>
 (standard input if not given)
@@ -56,9 +56,9 @@ traced in both directions.</para>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
  <blockquote remap='RS'>
-<para>$ cad_parea
+<para>$ <emphasis remap='I'>cad_parea
 <!-- .br -->
-# <emphasis remap='I'>comment</emphasis>
+# comment
 <!-- .br -->
 1 0
 <!-- .br -->
@@ -80,7 +80,6 @@ traced in both directions.</para>
 <!-- .br -->
 1 1
 <!-- .br -->
-<emphasis remap='I'>
 ^D</emphasis>
 <!-- .br -->
 4
@@ -88,17 +87,17 @@ traced in both directions.</para>
 </refsect1>

 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
-<para><citerefentry><refentrytitle>cad_boundp</refentrytitle><manvolnum>1</manvolnum></citerefentry></para>
+<para><citerefentry><refentrytitle>cad_boundp</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
 </refsect1>

 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
 <para>Improperly formatted input
 produces an error message
 and terminates
-<command>cad_parea</command>
+<emphasis remap='I'>cad_parea</emphasis>
 with non-zero exit status.</para>

-<para><command>cad_parea</command>
+<para><emphasis remap='I'>cad_parea</emphasis>
 outputs "0"
 for the area
 of a degenerate polygon.</para>
@@ -23,7 +23,7 @@


 <refsection xml:id="description"><title>DESCRIPTION</title>
-<para><command>cell-fb</command>
+<para><emphasis remap="I">Cell-fb</emphasis>
 reads a stream of cell-by-cell data
 and displays the data, one view at a time, on a frame buffer.
 If
@@ -48,10 +48,10 @@ reference, which, through a color map, corresponds to a color.</para>
  </listitem>
  </varlistentry>
  <varlistentry>
-  <term><option>-F </option><replaceable>fbfile</replaceable></term>
+  <term><option>-F</option><replaceable>fbfile</replaceable></term>
  <listitem>
 <para>Write graphics output to
-<emphasis remap="I">fbfile</emphasis>,
+<emphasis remap="I">fbfile,</emphasis>
 which may be any UNIX file (or frame-buffer device).
 In the absence of the
 <option>-F</option>
@@ -68,67 +68,67 @@ Otherwise, the host's default frame buffer is used
  </listitem>
  </varlistentry>
  <varlistentry>
-  <term><option>-N </option><replaceable>scr_height</replaceable></term>
+  <term><option>-N</option><replaceable>scr_height</replaceable></term>
  <listitem>
 <para>Set screen (frame-buffer) height to
 <emphasis remap="I">scr_height</emphasis>
-pixels, where
-<emphasis remap="I">scr_height</emphasis>
+pixels.
+<emphasis remap="I">Scr_height</emphasis>
 may legally be any integer greater than -2.
 See the discussion of autosizing below.</para>
  </listitem>
  </varlistentry>
  <varlistentry>
-  <term><option>-S </option><replaceable>scr_size</replaceable></term>
+  <term><option>-S</option><replaceable>scr_size</replaceable></term>
  <listitem>
 <para>Set screen (frame-buffer) width and height to
 <emphasis remap="I">scr_size</emphasis>
-pixels, where
-<emphasis remap="I">scr_size</emphasis>
+pixels.
+<emphasis remap="I">Scr_size</emphasis>
 may legally be any integer greater than -2.
 See the discussion of autosizing below.</para>
  </listitem>
  </varlistentry>
  <varlistentry>
-  <term><option>-W </option><replaceable>scr_width</replaceable></term>
+  <term><option>-W</option><replaceable>scr_width</replaceable></term>
  <listitem>
 <para>Set screen (frame-buffer) width to
 <emphasis remap="I">scr_width</emphasis>
-pixels, where
-<emphasis remap="I">scr_width</emphasis>
+pixels.
+<emphasis remap="I">Scr_width</emphasis>
 may legally be any integer greater than -2.
 See the discussion of autosizing below.</para>
  </listitem>
  </varlistentry>
  <varlistentry>
-  <term><option>-X </option><replaceable>n</replaceable></term>
+  <term><option>-X</option><replaceable>n</replaceable></term>
  <listitem>
 <para>Set the local debug flag to the hexadecimal value
-<emphasis remap="I">n</emphasis>.</para>
+<emphasis remap="I">n.</emphasis></para>
  </listitem>
  </varlistentry>
  <varlistentry>
-  <term><option>-a </option><replaceable>h v</replaceable><emphasis remap="B"/></term>
+  <term><option>-a</option><replaceable>“h v”</replaceable><emphasis remap="B"/></term>
  <listitem>
 <para>Do not display the data,
 simply print out the frame-buffer coordinates of the grid-plane point
-(<emphasis remap="I">h</emphasis>, <emphasis remap="I">v</emphasis>).
+(<emphasis remap="I">h, v</emphasis>).
 This option is useful for outboard manipulation of the
 <citerefentry><refentrytitle>pix</refentrytitle><manvolnum>5</manvolnum></citerefentry>
 data created by
-<command>cell-fb</command> .</para>
+<emphasis remap="I">cell-fb.</emphasis></para>
  </listitem>
  </varlistentry>
  <varlistentry>
-  <term><option>-b </option><replaceable>n</replaceable></term>
+  <term><option>-b</option><replaceable>n</replaceable></term>
  <listitem>
 <para>Ignore values not equal to
-<emphasis remap="I">n</emphasis>.
+<emphasis remap="I">n.</emphasis>
 All other cell-data values are mapped to the background color.</para>
  </listitem>
  </varlistentry>
  <varlistentry>
-  <term><option>-c </option><replaceable>n</replaceable></term>
+  <term><option>-c</option><replaceable>n</replaceable></term>
  <listitem>
 <para>Assume a cell size of
 <emphasis remap="I">n</emphasis>
@@ -137,10 +137,10 @@ The default cell size is 100 user units.</para>
  </listitem>
  </varlistentry>
  <varlistentry>
-  <term><option>-d </option><replaceable>m n</replaceable><emphasis remap="B"/></term>
+  <term><option>-d</option><replaceable>“m n”</replaceable><emphasis remap="B"/></term>
  <listitem>
 <para>Scale the data values from the interval
-[<emphasis remap="I">m</emphasis>, <emphasis remap="I">n</emphasis>]
+[<emphasis remap="I">m, n</emphasis>]
 into the unit interval [0, 1].
 The scaling is performed before values are mapped to colors,
 so the
@@ -163,7 +163,7 @@ for which no scaling is necessary.</para>
  </listitem>
  </varlistentry>
  <varlistentry>
-  <term><option>-f </option><replaceable>n</replaceable></term>
+  <term><option>-f</option><replaceable>n</replaceable></term>
  <listitem>
 <para>Display field number
 <emphasis remap="I">n</emphasis>
@@ -179,6 +179,13 @@ By default, field 1 is displayed.</para>
  <listitem>
 <para>Display the grid.
 Causes a 1-pixel spacing between cells in the output.</para>
+  </listitem>
+  </varlistentry>
+  <varlistentry>
+  <term><option>-h</option></term>
+  <listitem>
+<para>Force high-resolution display (1024×1024 pixels).
+See the discussion of autosizing below.</para>
  </listitem>
  </varlistentry>
  <varlistentry>
@@ -209,7 +216,7 @@ See the discussion of autosizing below.</para>
  </listitem>
  </varlistentry>
  <varlistentry>
-  <term><option>-l </option><replaceable>az el</replaceable><emphasis remap="B"/></term>
+  <term><option>-l</option><replaceable>“az el”</replaceable><emphasis remap="B"/></term>
  <listitem>
 <para>Write log information to the standard output.
 When given this option,
@@ -227,19 +234,19 @@ If a single view has not been specified,
 this option causes an implicit
 <option>-v</option> 1,
 which may, of course, be overridden explicitly.
-N.B. <command>cell-fb</command>
+N.B.—<emphasis remap="I">Cell-fb</emphasis>
 makes no use whatever of the values
 <emphasis remap="I">az</emphasis> and <emphasis remap="I">el</emphasis>,
 it merely writes them to the log.</para>
  </listitem>
  </varlistentry>
  <varlistentry>
-  <term><option>-m </option><replaceable>n color</replaceable><emphasis remap="B"/></term>
+  <term><option>-m</option><replaceable>“n color”</replaceable><emphasis remap="B"/></term>
  <listitem>
 <para>Map cell data value
 <emphasis remap="I">n</emphasis>
 to
-<emphasis remap="I">color</emphasis>.
+<emphasis remap="I">color.</emphasis>
 The value
 <emphasis remap="I">n</emphasis>
 will be truncated, if necessary, to
@@ -247,20 +254,20 @@ the nearest lower of the discrete values listed in the description of the
 <option>-k</option>
 option above.
 The background color can be indexed by specifying the value 1.1 for
-<emphasis remap="I">n</emphasis>.
+<emphasis remap="I">n.</emphasis>
 For the meaning and format of
-<emphasis remap="I">color</emphasis>,
+<emphasis remap="I">color,</emphasis>
 see the
 <link linkend="definitions">DEFINITIONS</link>
 section below.</para>
  </listitem>
  </varlistentry>
  <varlistentry>
-  <term><option>-M </option><replaceable>color1 color2</replaceable><emphasis remap="B"/></term>
+  <term><option>-M</option><replaceable>“color1 color2”</replaceable><emphasis remap="B"/></term>
  <listitem>
 <para>Define the color map
 to be a ramp between
-<emphasis remap="I">color1</emphasis> and <emphasis remap="I">color2</emphasis>.
+<emphasis remap="I">color1</emphasis> and <emphasis remap="I">color2.</emphasis>
 This allows frugality with the colors in an image:
 if, for example, cell data is plotted in gray scale,
 then many other colors remain for use in
@@ -270,14 +277,14 @@ is a typical cold-to-hot, blue-to-red scale,
 excepting that the smallest value in the input domain
 is mapped to white.
 For the meaning and format of
-<emphasis remap="I">color1</emphasis> and <emphasis remap="I">color2</emphasis>,
+<emphasis remap="I">color1</emphasis> and <emphasis remap="I">color2,</emphasis>
 see the
 <link linkend="definitions">DEFINITIONS</link>
 section below.</para>
  </listitem>
  </varlistentry>
  <varlistentry>
-  <term><option>-p </option><replaceable>h v</replaceable><emphasis remap="B"/></term>
+  <term><option>-p</option><replaceable>“h v”</replaceable><emphasis remap="B"/></term>
  <listitem>
 <para>Offset the picture from the lower-left corner of the frame buffer display
 by
@@ -290,13 +297,12 @@ then the horizontal and vertical offsets are both set to this value.</para>
  </listitem>
  </varlistentry>
  <varlistentry>
-  <term><option>-s </option><replaceable>w h</replaceable><emphasis remap="B"/></term>
+  <term><option>-s</option><replaceable>“w h”</replaceable><emphasis remap="B"/></term>
  <listitem>
 <para>Plot each cell as a rectangle of width
 <emphasis remap="I">w</emphasis>
 pixels and height
-<emphasis remap="I">h</emphasis>
-pixels.
+<emphasis remap="I">h</emphasis>pixels.
 This option has the effect of scaling the picture independently in the
 horizontal and vertical dimensions.
 The default is 10 pixels per cell in each dimension, not including the
@@ -306,10 +312,10 @@ then the width and height are both set to this value.</para>
  </listitem>
  </varlistentry>
  <varlistentry>
-  <term><option>-v </option><replaceable>n</replaceable></term>
+  <term><option>-v</option><replaceable>n</replaceable></term>
  <listitem>
 <para>Display only view number
-<emphasis remap="I">n</emphasis>.
+<emphasis remap="I">n.</emphasis>
 Views are numbered starting at 1.
 If
 <emphasis remap="I">n</emphasis> = 0,
@@ -317,19 +323,19 @@ all views are displayed sequentially,
 which is the default behavior.
 The option
 <option>-v</option> 0
-implicitly turns off logging
+implicitly turns off logging.
 (see the
 <option>-l</option>
 option above).</para>
  </listitem>
  </varlistentry>
  <varlistentry>
-  <term><option>-x </option><replaceable>n</replaceable></term>
+  <term><option>-x</option><replaceable>n</replaceable></term>
  <listitem>
 <para>Set the
 <citerefentry><refentrytitle>libbu</refentrytitle><manvolnum>3</manvolnum></citerefentry>
 debug flag to the hexadecimal value
-<emphasis remap="I">n</emphasis>.
+<emphasis remap="I">n.</emphasis>
 This option is useful primarily in debugging
 memory allocation.</para>
  </listitem>
@@ -347,7 +353,7 @@ utility such as
 </refsection>

 <refsection xml:id="discussion"><title>DISCUSSION</title>
-<para><command>cell-fb</command>
+<para><emphasis remap="I">Cell-fb</emphasis>
 determines the appropriate width and height of the frame buffer
 independently.
 For each there are three methods.
@@ -361,7 +367,7 @@ options,
 will use exactly the specified values.
 Otherwise,
 it performs autosizing for each view.
-<command>cell-fb</command>'s
+<emphasis remap="I">Cell-fb</emphasis>'s
 original behavior is called loose-fit autosizing.
 In that case, a frame-buffer dimension will be set to 512 pixels
 unless the image will not fit,
@@ -455,7 +461,7 @@ the color key will appear underneath the
 grid of cells, and the display will be erased before each view is drawn.</para>

 <literallayout remap="RS" class="normal">
-$  cell-fb -F fictitious.brlcad.org: -gek -p 20 30 inputs
+$  <emphasis remap="I">cell-fb</emphasis>  -F  fictitious.brlcad.org:  -gek  -p  “20 30”  inputs
 </literallayout> <!-- remap='RE' -->
 </refsection>

@@ -42,12 +42,12 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>chan_mult</command>
+<para><emphasis remap='I'>Mult_chan</emphasis>
 will multiply all numbers in the specified columns by the given
-factor. The <emphasis remap='I'>infile</emphasis> is
+factor. The infile is
 an ASCII file, with columns separated by white space. The columns are
 numbered from 0 to (n-1).
-<command>chan_add</command>
+<emphasis remap='I'>Add_chan</emphasis>
 behaves analogously, but with
 addition rather than multiplication.</para>
 </refsect1>
@@ -37,25 +37,25 @@ channels or columns. Each word, separated by whitespaces, should be less
 than 40 characters long. The channels in each input file are specified
 and then mapped to the desired channels in the output file(s). These are
 the sort of things that can be done using
-<command>cut</command>
+<emphasis remap='I'>cut</emphasis>
 and
-<command>paste</command>,
+<emphasis remap='I'>paste,</emphasis>
 but when
 working on animation tables it's often nice to be able to do it in one
 step.</para>

-<para><emphasis remap='I'>Infile</emphasis>s
+<para><emphasis remap='B'>Infile</emphasis>s
 are files to be read from,
-<emphasis remap='I'>outfile</emphasis>s
+<emphasis remap='B'>outfile</emphasis>s
 are files to be written
 to, and each
-<emphasis remap='I'>id</emphasis>
+<emphasis remap='B'>id</emphasis>
 is a small positive integer identifying a channel. All of the
 input
-<emphasis remap='I'>id</emphasis>'s
+<emphasis remap='B'>id</emphasis>'s
 should be distinct integers, or the results are not guaranteed.</para>

-<para><command>chan_permute</command>
+<para><emphasis remap='I'>Chan_permute</emphasis>
 interprets
 <option>-i stdin</option>
 as standard input and
@@ -85,7 +85,7 @@ followed by both columns of file1.</para>
 more than once for input, but may not be referenced for input and output
 together or output and output together. In the latter case, the second
 output reference overrides the other. 	The
-<emphasis remap='I'>id</emphasis>'s
+<emphasis remap='B'>id</emphasis>'s
 must be integers
 somewhere between 0 and the number of arguments, inclusive.</para>
 </refsect1>
@@ -24,7 +24,7 @@


 <refsection xml:id="description"><title>DESCRIPTION</title>
-<para><command>cmap-fb</command>
+<para><emphasis remap="I">Cmap-fb</emphasis>
 loads a colormap into a framebuffer.  A colormap
 file can be specified on the command line, otherwise standard
 input will be read.
@@ -39,9 +39,9 @@ the framebuffer will be retained (one can view this as
 "overlaying" the existing colormap).</para>

 <para>By default, the display is assumed to be 512x512 pixels;
-if the
+by specifying the
 <option>-H</option>
-flag is specified, the size is changed to 1024x1024.
+flag, the size is changed to 1024x1024.
 This size distinction is important for devices like the Adage
 framebuffers which have different operating modes based on the
 display size.</para>
@@ -29,7 +29,7 @@
  <para>
    <command>coil</command> creates a pipe shape within <emphasis remap="I">coil.g</emphasis>
    or a user supplied file that implements a coil according to user provided dimensions.
-    If no dimensions are supplied, defaults are used.
+    If no dimensions are supplied defaults are used.
  </para>
 </refsection>

@@ -32,11 +32,11 @@ a GIFT-style input file, convert the geometry into
 the internal form used by the BRL-CAD package,
 and write an MGED-style binary database.</para>

-<para>Each solid is given the name s###, retaining the COMGEOM solid number.
-Each region is given the name r###, retaining the COMGEOM region number.
-Regions are grouped together into various groups g### based
-on the region-id numbers.  Group g00 gets all regions with region-id
-of zero, g0 gets ids one through 99, g1 gets ids 100 through 199, etc.</para>
+<para>Each solid is given the name “s###”, retaining the COMGEOM solid number.
+Each region is given the name “r###”, retaining the COMGEOM region number.
+Regions are grouped together into various groups “g###” based
+on the region-id numbers.  Group “g00” gets all regions with region-id
+of zero, “g0” gets ids one through 99, “g1” gets ids 100 through 199, etc.</para>

 <para>The default input is COMGEOM version 5.
 Version 4 can be converted by specifying the
@@ -70,7 +70,7 @@ feature of
 </refsect1>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<para>comgeom-g -d1 -v4 <emphasis remap='I'>file.cg file.g</emphasis></para>
+<para><emphasis remap='I'>comgeom-g -d1 -v4 file.cg file.g</emphasis></para>
 </refsect1>

 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
@@ -24,7 +24,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>conv-vg2g</command>
+<para><emphasis remap='I'>Conv-vg2g</emphasis>
 converts several older forms of binary
 <citerefentry><refentrytitle>mged</refentrytitle><manvolnum>1</manvolnum></citerefentry>
 databases to the current form.</para>
@@ -41,7 +41,7 @@ Especially for double-precision floating point,
 DEC, Cray, and IBM have peculiar formats and byte orderings.
 The network-independent byte orderings used within BRL-CAD is
 big-endian (most significant bit first, on the left side of the word),
-twos complement.
+twos compliment.
 The network-independent double-precision floating point format used
 within BRL-CAD is 64-bit IEEE 754, transmitted in big-endian order.</para>

@@ -59,12 +59,12 @@ format would be "hss", and the output format would be "n32".</para>
 </refsect1>

 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
-<para><citerefentry><refentrytitle>pix-bw</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>dpix-pix</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bw-pix</refentrytitle><manvolnum>1</manvolnum></citerefentry>;
+<para><citerefentry><refentrytitle>pix-bw</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>dpix-pix</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>bw-pix</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
 <!-- .br -->
 M. J. Muuss,
 ``<emphasis remap='I'>Workstations, Networking, Distributed Graphics, and Parallel Processing</emphasis>``
 in Computer Graphics Techniques:  Theory and Practice,
-edited by D. F. Rogers, R. A. Earnshaw, Springer-Verlag, 1990</para>
+edited by D. F. Rogers, R. A. Earnshaw, Springer-Verlag, 1990.</para>

 </refsect1>

@@ -24,7 +24,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>cy-g</command>
+<para><emphasis remap='I'>cy-g</emphasis>
 converts the specified
 <emphasis remap='I'>input_cy_file</emphasis>
 to a BRL-CAD
@@ -38,7 +38,7 @@ scan format.  The result of the conversion is a single

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ cy-g <emphasis remap='I'>sample.cy sample.g</emphasis>
+$ <emphasis remap='I'>cy-g sample.cy sample.g</emphasis>
 </synopsis>
 </refsect1>

@@ -35,7 +35,7 @@

    <variablelist>
      <varlistentry>
-	<term><emphasis>match</emphasis><option>regular_exp</option></term>
+	<term><emphasis>match [regular_exp]</emphasis></term>
 	<listitem>
 	  <para>
 	    Returns a list of all objects in that database that match the list of regular
@@ -45,7 +45,7 @@
      </varlistentry>

      <varlistentry>
-	<term><emphasis>get shape_or_path</emphasis><option>attribute</option></term>
+	<term><emphasis>get shape_or_path [attribute]</emphasis></term>
 	<listitem>
 	  <para>
 	    Returns information about the primitive shape at the end of the <emphasis>shape_or_path</emphasis>.
@@ -70,7 +70,7 @@
      </varlistentry>

      <varlistentry>
-	<term><emphasis>adjust shape_name attribute new_value1</emphasis><option>new_value2 new_value3 ...</option></term>
+	<term><emphasis>adjust shape_name attribute new_value1 [new_value2 new_value3...]</emphasis></term>
 	<listitem>
 	  <para>
 	    Modifies the shape named <emphasis>shape_name</emphasis> by adjusting the value of its
@@ -24,14 +24,14 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>dbclean</command>
+<para><emphasis remap='I'>Dbclean</emphasis>
 operates on the indicated input database
 <emphasis remap='I'>in_model.g</emphasis>
-and produces a compacter version of the same as
+and produces a compacter version of the same
 <emphasis remap='I'>out_model.g.</emphasis></para>

-<para>The objective is to remove "holes" in the original database which resulted from use of
-the <emphasis remap='I'>kill</emphasis>/<emphasis remap='I'>killall</emphasis> commands in
+<para>The objective is to remove ``holes" left in the original database by using
+the <emphasis remap='I'>kill/killall</emphasis> command in
 <citerefentry><refentrytitle>mged</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
 Note that when a database is compacted in this manner, the compacting is
 dependent on the successful completion of the converters
@@ -39,24 +39,24 @@ dependent on the successful completion of the converters
 and
 <citerefentry><refentrytitle>asc2g</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
 The compacting will only be aborted if one of the conversions fails.  Thus,
-when either converter "skips" solids, <command>dbclean</command> will continue, and
+when either converter ``skips" solids, <command>dbclean</command> will continue, and
 <emphasis remap='I'>out_model.g</emphasis>
-will be written, albeit without the skipped solids.  This will also
+will be written, albeit, without the skipped solids.  This will also
 result in a smaller database.</para>
 </refsect1>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<para>This section will acquaint the user with the ordinary usage of <command>dbclean</command> .</para>
+<para>This section will acquaint the user with the ordinary usage of <command>dbclean</command>.</para>

 <literallayout remap='.nf'>
-dbclean <emphasis remap='I'>in_model.g out_model.g</emphasis>
+<emphasis remap='I'>dbclean in_model.g out_model.g</emphasis>
 </literallayout> <!-- .fi -->

 <para>This will result in a compacted version of the input.</para>
 </refsect1>

 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
-<para><citerefentry><refentrytitle>mged</refentrytitle><manvolnum>1</manvolnum></citerefentry></para>
+<para><citerefentry><refentrytitle>mged</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
 </refsect1>

 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
@@ -31,7 +31,7 @@
 <para><command>dbcp</command>
 is a program for copying data rapidly between devices.</para>

-<para>This command is DEPRECATED.  Use <command>dd</command> instead.</para>
+<para>This command is DEPRECATED.  Use 'dd' instead.</para>

 <para>While the primary application is to move data between raw devices such as
 tape and disk, it can also be used with pipes.
@@ -55,15 +55,15 @@ the number of records processed is printed upon exit.</para>
 </refsect1>

 <refsect1 xml:id='examples'><title>EXAMPLES</title>
-<para>$ <emphasis remap='B'>dbcp 16 &lt; /dev/rdk1a &gt; /dev/rmt0</emphasis></para>
-<para>
+<para>$ <emphasis remap='B'>dbcp 16 &lt; /dev/rdk1a &gt; /dev/rmt0</emphasis>
+<!-- .br -->
 <command>dbcp</command>
 copies the filesystem on dk1a to tape
 with a record size of 8K bytes (16 * 512).
 This allows "streaming" tape drives to operate a peak speed.</para>

-<para>$ <emphasis remap='B'>tar cf - . | dbcp 20 &gt; /dev/rmt0</emphasis></para>
-<para>
+<para>$ <emphasis remap='B'>tar cf - . | dbcp 20 &gt; /dev/rmt0</emphasis>
+<!-- .br -->
 The
 <emphasis remap='I'>tar</emphasis>
 process runs independently of the
@@ -26,7 +26,7 @@
 <refsect1 xml:id='description'><title>DESCRIPTION</title>
 <para><command>dbupgrade</command>
 operates on the indicated input geometry database
-<emphasis remap='I'>input.g</emphasis>,
+<emphasis remap='I'>input.g</emphasis>
 recognizing the version of the BRL-CAD database provided as input and
 then converting it to the current database version.  Output is then saved to the specified
 <emphasis remap='I'>output.g</emphasis>
@@ -38,7 +38,7 @@ binary-incompatible platform.  However, this process may be imperfect - the best
 the original platform on which the file was created is available) is to run
 <command>dbupgrade</command>
 on the file before transferring from the originating platform.  Once upgraded the output file will be
-platform-independent regardless of the platform on which the upgrade was done.</para>
+platform independent regardless of the platform on which the upgrade was done.</para>

 <para>Running
 <command>dbupgrade</command>
@@ -46,12 +46,12 @@ removes the need to run
 <citerefentry><refentrytitle>g2asc</refentrytitle><manvolnum>1</manvolnum></citerefentry>
 and
 <citerefentry><refentrytitle>asc2g</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-on a database to move it between computers (historically this was a way to work around the platform-specific nature of v4 files).
-The latest BRL-CAD geometry database format is platform-independent.</para>
+on a database to move it between computers (historically this was a way to work around the platform specific nature of v4 files.)
+The latest BRL-CAD geometry database format is platform independent.</para>
 </refsect1>

 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
-<para><citerefentry><refentrytitle>mged</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>g2asc</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>asc2g</refentrytitle><manvolnum>1</manvolnum></citerefentry></para>
+<para><citerefentry><refentrytitle>mged</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>g2asc</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>asc2g</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
 </refsect1>

 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
@@ -29,7 +29,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>dxf-g</command>
+<para><emphasis remap='I'>dxf-g</emphasis>
 converts the specified
 <emphasis remap='I'>file.dxf</emphasis>
 to a BRL-CAD
@@ -78,7 +78,7 @@ will be considered to be the same vertex.</para>
 </variablelist>

 <para>The
-<emphasis remap='I'>file.dxf</emphasis>
+<emphasis remap='B'>file.dxf</emphasis>
 file is expected to be in the ASCII Autodesk DXF format as defined in the
 Autocad 2006 manuals. This converter handles entities of types:</para>

@@ -115,11 +115,11 @@ SPLINE</para>
 <para>The POLYLINE entities in AUTOCAD are actually a container for numerous different entity types. The types
 of POLYLINE entities converted include:</para>

-<para>3D polylines;
+<para>3D polylines
 <!-- .br -->
-3D polygon meshes;
+3D polygon meshes
 <!-- .br -->
-polyface meshes</para>
+polyface meshes.</para>

 <para>SOLID entities are 2D shapes with a solid fill, but this converter does not do
 any filling.
@@ -128,7 +128,7 @@ Each layer is converted to a separate object. Colors are also converted.</para>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ dxf-g <emphasis remap='I'>sample.dxf sample.g</emphasis>
+$ <emphasis remap='I'>dxf-g sample.dxf sample.g</emphasis>
 </synopsis>
 </refsect1>

@@ -29,7 +29,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>enf-g</command>
+<para><emphasis remap='I'>enf-g</emphasis>
 converts the specified
 <emphasis remap='I'>input_enf_facet_file</emphasis>
 to a BRL-CAD
@@ -57,7 +57,7 @@ by a tab.

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ enf-g <emphasis remap='I'>sample.enf sample.g</emphasis>
+$ <emphasis remap='I'>enf-g sample.enf sample.g</emphasis>
 </synopsis>
 </refsect1>

@@ -24,7 +24,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>euclid-g</command>
+<para><emphasis remap='I'>euclid-g</emphasis>
 converts the specified
 <emphasis remap='I'>euclid_file</emphasis>
 to a BRL-CAD
@@ -41,7 +41,7 @@ together all the objects with the same ID number.</para>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ euclid-g <emphasis remap='I'>sample.euclid sample.g</emphasis>
+$ <emphasis remap='I'>euclid-g sample.euclid sample.g</emphasis>
 </synopsis>
 </refsect1>

@@ -30,7 +30,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>fast4-g</command>
+<para><emphasis remap='I'>fast4-g</emphasis>
 converts the specified
 <emphasis remap='I'>file.fastgen4</emphasis>
 to a BRL-CAD
@@ -72,14 +72,14 @@ file.</para>
 option allows the user to specify a restricted set of components to process from the
 input file. The
 <emphasis remap='I'>id_list</emphasis>
-may be a comma-separated list of ident numbers and ranges. For example,
+may be a comma separated list of ident numbers and ranges. For example,
 <option>-c 3002,5678,9213,1002-1100</option>
 will convert only the regions with idents of 3002,5678,9213, and everything from 1002 through 1100.</para>

 <para>If you have a FASTGEN2 or FASTGEN3 format file, they can be converted by processing them with
-<command>rpatch</command>
+<emphasis remap='I'>rpatch</emphasis>
 and then providing the resulting rpatch file to the
-<command>patch-g</command>
+<emphasis remap='I'>patch-g</emphasis>
 converter.  See their respective manual pages for more information.</para>

 <para>The
@@ -87,21 +87,24 @@ converter.  See their respective manual pages for more information.</para>
 file is expected to be in the FASTGEN 4.1 format as defined in the
 FASTGEN 4.1 User Manual.</para>

-<para><emphasis remap='I'>CCONE1</emphasis>, <emphasis remap='I'>CCONE2</emphasis>,
+<para><emphasis remap='I'>CCONE1, CCONE2,</emphasis>
 and
 <emphasis remap='I'>CCONE3</emphasis>
 elements are converted to BRL-CAD truncated right cylinders
-(<emphasis remap='I'>TRC</emphasis>). <emphasis remap='I'>CHEX2</emphasis>
+<emphasis remap='I'>(TRC). CHEX2</emphasis>
 elements are converted to BRL-CAD arbitrary convex polyhedrons
-(<emphasis remap='I'>ARB8</emphasis>). <emphasis remap='I'>CLINE</emphasis>
+<emphasis remap='I'>(ARB8).</emphasis>
+<emphasis remap='I'>CLINE</emphasis>
 elements are converted to BRL-CAD cline solids.
-<emphasis remap='I'>CQUAD</emphasis>,
-<emphasis remap='I'>CTRI</emphasis>, and
+<emphasis remap='I'>CQUAD</emphasis>
+,
+<emphasis remap='I'>CTRI</emphasis>
+, and
 <emphasis remap='I'>CHEX1</emphasis>
 elements are converted to faces of a BRL-CAD BOT (Bag Of Triangles).
 <emphasis remap='I'>CSPHERE</emphasis>
 elements are converted to BRL-CAD sphere
-(<emphasis remap='I'>SPH</emphasis>)
+<emphasis remap='I'>(SPH)</emphasis>
 solids. BRL-CAD region ident numbers are assigned by combining the
 FASTGEN4 group and component numbers:</para>

@@ -116,7 +119,7 @@ elements using an algorithm to create unique BRL-CAD names.</para>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ fast4-g <emphasis remap='I'>sample.fastgen4 sample.g</emphasis>
+$ <emphasis remap='I'>fast4-g sample.fastgen4 sample.g</emphasis>
 </synopsis>
 </refsect1>

@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<refentry xmlns='http://docbook.org/ns/docbook' version='5.0' xml:lang='en' xml:id="fborle1">
+<refmeta>
+    <refentrytitle>FB-ORLE
+</refentrytitle>
+<manvolnum>1</manvolnum>
+<refmiscinfo class="source">BRL-CAD</refmiscinfo>
+<refmiscinfo class="manual">BRL-CAD</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+<refname>fb-orle</refname>
+<refpurpose>save a frame buffer image in old run-length encoded form</refpurpose>
+</refnamediv>
+<!-- body begins here -->
+<refsynopsisdiv xml:id="synopsis">
+<cmdsynopsis sepchar=" ">
+  <command>fb-orle</command>
+    <arg choice="opt" rep="norepeat">-CScdHvw </arg>
+    <arg choice="opt" rep="norepeat"><arg choice="plain" rep="norepeat">-l </arg><arg choice="plain" rep="norepeat"><replaceable>x</replaceable></arg><arg choice="plain" rep="norepeat"><replaceable>y</replaceable></arg></arg>
+    <arg choice="opt" rep="norepeat"><arg choice="plain" rep="norepeat">-F </arg><arg choice="plain" rep="norepeat"><replaceable>Frame_buffer</replaceable></arg></arg>
+    <arg choice="opt" rep="norepeat"><arg choice="plain" rep="norepeat">-p </arg><arg choice="plain" rep="norepeat"><replaceable>x</replaceable></arg><arg choice="plain" rep="norepeat"><replaceable>y</replaceable></arg></arg>
+    <arg choice="opt" rep="norepeat"><replaceable>file.rle</replaceable></arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+
+<refsection xml:id="description"><title>DESCRIPTION</title>
+<para><command>fb-orle</command>
+saves a frame buffer image in a file, using the
+old University of Utah standard (Edition-2)
+Run-Length Encoded (RLE) format.
+This program is provided for compatibility with the old RLE image
+tools, and generally should not be used for saving new images,
+except where compatibility with the old tools is a factor.
+The equivalent new tool is
+<emphasis remap="I">fb-rle(1)</emphasis>.</para>
+
+<para>The environment
+variable
+<envar>FB_FILE</envar>
+is used to select the display device (see
+<emphasis remap="I">brlcad(1)</emphasis>).
+If this variable is not set, the default device for your system will
+be used.
+If
+<emphasis remap="I">file.rle</emphasis>
+is not specified, the encoded file is written to standard output.
+<command>fb-orle</command>
+attempts to compress flat-colored areas
+as much as possible.
+This means that it is generally reasonable to save an entire
+image, since in RLE format it will not take up much more file space
+than extracting and saving only the
+interesting portion of the image.
+The default action is to encode only data
+pixels and to save the background color separately, so that when the image
+is restored all non-image pixels will be set to the background pixel value
+stored in the RLE header.
+Images saved in this mode may be displayed normally, or in overlay
+mode by the RLE decoder program (see
+<citerefentry><refentrytitle>orle-fb</refentrytitle><manvolnum>1</manvolnum></citerefentry>).
+Alternatively, the
+<option>-S</option>
+option may be used to RLE-encode the background as well (recommended only
+if you don't have a flat background).</para>
+<variablelist remap="TP">
+  <varlistentry>
+  <term><option>-C</option></term>
+  <listitem>
+<para>Convert (crunch) an image with a non-standard color map so that the
+RLE file created will redisplay with a standard color map.
+Useful to preserve dramatic images created with weird color maps
+so that Gamma correction (for film) can then also be applied.
+This option is recommended when producing images for export to other
+display systems, so that variations in the interpretation of color maps
+between different types of display hardware do
+not affect the displayed image.</para>
+  </listitem>
+  </varlistentry>
+  <varlistentry>
+  <term><option>-w</option></term>
+  <listitem>
+<para>Convert the color image to black and white, and RLE-encode that.
+The red, green, and blue components of each
+pixel are combined via the NTSC transform to get an intensity value (Y) which
+is saved.  A more versatile tool for this is
+<citerefentry><refentrytitle>pix-bw</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
+  </listitem>
+  </varlistentry>
+  <varlistentry>
+  <term><option>-S</option></term>
+  <listitem>
+<para>Save all data in RLE format,
+irrespective of whether it is background or not (straight box save).
+It is not possible to
+restore a file saved with
+<option>-S</option>
+as an overlay.</para>
+  </listitem>
+  </varlistentry>
+  <varlistentry>
+  <term><option>-c</option></term>
+  <listitem>
+<para>Only save color map.
+</para>
+  </listitem>
+  </varlistentry>
+  <varlistentry>
+  <term><option>-l</option><replaceable> x y</replaceable></term>
+  <listitem>
+<para>Specify the size of the saved box.
+This is useful if only a portion of the image is to be saved.</para>
+  </listitem>
+  </varlistentry>
+  <varlistentry>
+  <term><option>-p</option><replaceable> x y</replaceable></term>
+  <listitem>
+<para>Specify the upper left corner of the saved portion
+of the image.</para>
+  </listitem>
+  </varlistentry>
+  <varlistentry>
+  <term><option>-F</option><replaceable> Frame_buffer</replaceable></term>
+  <listitem>
+<para>Specify frame buffer.</para>
+  </listitem>
+  </varlistentry>
+  <varlistentry>
+  <term><option>-v</option></term>
+  <listitem>
+<para>Verbose mode.
+The program will provide voluminous status information
+on its standard error as it proceeds through encoding the image.</para>
+  </listitem>
+  </varlistentry>
+  <varlistentry>
+  <term><option>-d</option></term>
+  <listitem>
+<para>Debug mode.</para>
+  </listitem>
+  </varlistentry>
+  <varlistentry>
+  <term><option>-H</option></term>
+  <listitem>
+<para>hi-res flag.  Set both the height and width of the framebuffer
+to 1024.  The default is 512x512.</para>
+  </listitem>
+  </varlistentry>
+</variablelist>
+</refsection>
+
+<refsection xml:id="example"><title>EXAMPLE</title>
+<literallayout remap="RS" class="normal">
+<emphasis remap="I">fb-orle -H tank.rle</emphasis>
+</literallayout> <!-- remap='RE' -->
+
+</refsection>
+
+<refsection xml:id="author"><title>AUTHOR</title>
+<para>BRL-CAD Team</para>
+
+</refsection>
+
+<refsection xml:id="copyright"><title>COPYRIGHT</title>
+<para>This software is Copyright (c) 1986-2014 by the United States
+Government as represented by U.S. Army Research Laboratory.</para>
+</refsection>
+
+<refsection xml:id="bug_reports"><title>BUG REPORTS</title>
+<para>Reports of bugs or problems should be submitted via electronic
+mail to &lt;devs@brlcad.org&gt;.</para>
+</refsection>
+</refentry>
@@ -35,7 +35,7 @@ The environment
 variable
 <envar>FB_FILE</envar>
 is used to select the display device (see
-<citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>).
+<emphasis remap="I">brlcad(1)</emphasis>).
 If this variable is not set, the default device for your system will
 be used.
 Alternatively, the framebuffer may be explicitly specified
@@ -37,7 +37,7 @@ The environment
 variable
 <envar>FB_FILE</envar>
 is used to select the display device (see
-<citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>).
+<emphasis remap="I">brlcad(1)</emphasis>).
 If this variable is not set, the default device for your system will
 be used.
 Alternatively, the framebuffer may be explicitly specified
@@ -80,7 +80,7 @@
            to be saved from.  If not given, the environment variable
            <acronym/><emphasis remap="B">FB_FILE</emphasis> is used
            to select the display device (see
-            <citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>).  If
+            <emphasis remap="I">brlcad(1)</emphasis>).  If
            <acronym/><emphasis remap="B">FB_FILE</emphasis> has not
            been set, the default device for your system will be
            used.</para>
@@ -62,7 +62,7 @@ equal intensity.
 At this point, all the other color bars will display the correct chroma.</para>

 <para>The environment variable FB_FILE specifies
-the current framebuffer; see
+the current framebuffer, see
 <citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
 Alternatively, the framebuffer may be explicitly specified
 by using the
@@ -84,8 +84,9 @@ sets both the height and width to the size given.</para>
 </refsection>

 <refsection xml:id="inspirations"><title>INSPIRATIONS</title>
-<para>Mike Pique, University of North Carolina</para>
-<para>Doris Kochanek, National Film Board of Canada</para>
+<para>Mike Pique, University of North Carolina
+<!-- .br -->
+Doris Kochanek, National Film Board of Canada</para>
 </refsection>

 <refsection xml:id="author"><title>AUTHOR</title>
@@ -36,7 +36,7 @@ is used to change the color map of a frame buffer.</para>
            to be saved from.  If not given, the environment variable
            <acronym/><emphasis remap="B">FB_FILE</emphasis> is used
            to select the display device (see
-            <citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>).  If
+            <emphasis remap="I">brlcad(1)</emphasis>).  If
            <acronym/><emphasis remap="B">FB_FILE</emphasis> has not
            been set, the default device for your system will be
            used.</para>
@@ -39,7 +39,7 @@ or HSI (hue, saturation, intensity) space.</para>
            to be saved from.  If not given, the environment variable
            <acronym/><emphasis remap="B">FB_FILE</emphasis> is used
            to select the display device (see
-            <citerefentry><refentrytitle>brlcad</refentrytitle><manvolnum>1</manvolnum></citerefentry>).  If
+            <emphasis remap="I">brlcad(1)</emphasis>).  If
            <acronym/><emphasis remap="B">FB_FILE</emphasis> has not
            been set, the default device for your system will be
            used.</para>
@@ -45,9 +45,9 @@ The
 <option>-H</option>
 option is for editing
 1024x1024 or high resolution
-(<emphasis remap='SM'>HIRES</emphasis>)
+<emphasis remap='SM'>(HIRES)</emphasis>
 images;  the default is low resolution, 512x512
-(<emphasis remap='SM'>LORES</emphasis>).
+<emphasis remap='SM'>(LORES)</emphasis>.
 The frame buffer's state can be toggled back and forth between
 <acronym>HIRES</acronym>
 and
@@ -22,7 +22,7 @@


 <refsection xml:id="description"><title>DESCRIPTION</title>
-<para><command>Fbfree</command>
+<para><emphasis remap="I">Fbfree</emphasis>
 is used to free any resources associated with a frame buffer.
 Its most common use is to close down an
 <citerefentry><refentrytitle>fbserv</refentrytitle><manvolnum>1</manvolnum></citerefentry>
@@ -62,9 +62,9 @@ result of this is the ability saturate or desaturate an arbitrary
 colormap.</para>

 <para>By default, the display is assumed to be 512x512 pixels;
-if the
+by specifying the
 <option>-H</option>
-flag is specified, the size is changed to 1024x1024.
+flag, the size is changed to 1024x1024.
 This size distinction is important for devices like the Adage
 framebuffers which have different operating modes based on the
 display size.
@@ -26,7 +26,7 @@


 <refsection xml:id="description"><title>DESCRIPTION</title>
-<para><command>fbgrid</command>
+<para><emphasis remap="I">Fbgrid</emphasis>
 is used to generate a grid on a frame buffer.
 The environment
 variable
@@ -22,22 +22,22 @@


 <refsection xml:id="description"><title>DESCRIPTION</title>
-<para><command>fbhelp</command>
+<para><emphasis remap="I">Fbhelp</emphasis>
 displays information about the selection of frame buffer devices
 available to the
 <citerefentry><refentrytitle>libfb</refentrytitle><manvolnum>3</manvolnum></citerefentry>
 frame buffer library and the whole family of
-<emphasis remap="B">fb</emphasis>
+<emphasis remap="B">fb∗</emphasis>
 programs in the BRL-CAD package, for the machine
 <command>fbhelp</command>
 is run on.</para>

-<para>The display device used by a program is taken first from the
-<option>-F </option><replaceable>framebuffer</replaceable>
+<para>The display device used by a program is taken first from a
+<option>-F </option><replaceable>framebuffer</replaceable>
 option if given, else from the environment variable
-<emphasis remap="SM">FB_FILE</emphasis>,
+<emphasis remap="SM">FB_FILE,</emphasis>
 or finally from whatever the default display is for that system.
-<command>fbhelp</command>
+<emphasis remap="I">Fbhelp</emphasis>
 will tell you what the available choices of frame buffers are,
 as well as detailed information about any options the currently
 selected device may have.</para>
@@ -24,7 +24,7 @@


 <refsection xml:id="description"><title>DESCRIPTION</title>
-<para><command>fbpoint</command>
+<para><emphasis remap="I">Fbpoint</emphasis>
 allows you to move a non-destructive cursor around on the display.
 As the cursor is moved around,
 <command>fbpoint</command>
@@ -33,7 +33,7 @@ at by the cursor, and the red, green, and blue values of that
 pixel, on standard error
 <command>fbpoint</command>
 also writes the last set of coordinates pointed to on standard out on exit.
-The starting position is center-screen unless optional
+The starting position is center-screen unless an optional
 <emphasis remap="I">initx inity</emphasis>
 is given.</para>

@@ -42,23 +42,24 @@ is given.</para>
 ``<emphasis remap="B">j</emphasis>'',
 ``<emphasis remap="B">k</emphasis>'',
 and
-``<emphasis remap="B">l</emphasis>''
+``<emphasis remap="B">l</emphasis>'',
 commands step the cursor one pixel left, down, up, or right respectively, and
 the
 ``<emphasis remap="B">H</emphasis>'',
 ``<emphasis remap="B">J</emphasis>'',
 ``<emphasis remap="B">K</emphasis>'',
 and
-``<emphasis remap="B">L</emphasis>''
-commands step the cursor in the corresponding directions in big increments.
+``<emphasis remap="B">L</emphasis>'',
+commands step the cursor in the corresponding direction in big increments.
 The
 ``<emphasis remap="B">B</emphasis>'',
 ``<emphasis remap="B">N</emphasis>'',
-``<emphasis remap="B">P</emphasis>'',
+``<emphasis remap="B">P</emphasis>''.
 and
 ``<emphasis remap="B">L</emphasis>'',
 and
-``<emphasis remap="B">^B</emphasis>'' (control-B),
+``<emphasis remap="B">^B</emphasis>'',
+(control-B),
 ``<emphasis remap="B">^N</emphasis>'',
 ``<emphasis remap="B">^P</emphasis>'',
 and
@@ -69,9 +70,9 @@ are also little and big (respectively) cursor movement commands.</para>
 ``<emphasis remap="B">?</emphasis>''
 prints a short command summary,
 and typing
-``<emphasis remap="B">q</emphasis>''
+``<emphasis remap="B">q</emphasis>'',
 or
-``<emphasis remap="B">Q</emphasis>''
+``<emphasis remap="B">Q</emphasis>'',
 exits the program.</para>

 <para>Using this program with grave accents in a shell script in order to
@@ -90,19 +91,21 @@ This is to facilitate passing the output of this program as
 arguments to another.</para>
 </refsection>

-<refsection xml:id="example"><title>EXAMPLES</title>
+<refsection xml:id="example"><title>EXAMPLE</title>
 <para><command>fbpoint</command>
 <!-- .br -->
 by itself is used to pick coordinates or pixel values from a display.</para>

-<para>fbscanplot `fbpoint -y`</para>
-<para>allows you to choose the scanline to plot using fbpoint.</para>
+<para><emphasis remap="I">fbscanplot `fbpoint -y`</emphasis>
+<!-- .br -->
+allows you to choose the scanline to plot using fbpoint.</para>

-<para>pix-fb `fbpoint -x-X -y-Y` <emphasis remap="I">file.pix</emphasis></para>
-<para>allows you to select an x, y screen coordinate location and then
+<para><emphasis remap="I">pix-fb `fbpoint -x-X -y-Y` file.pix</emphasis>
+<!-- .br -->
+will allow you to select an x, y screen coordinate and then
 place the lower left corner of the image
 <emphasis remap="I">file.pix</emphasis>
-there.</para>
+at that location.</para>
 </refsection>

 <refsection xml:id="see_also"><title>SEE ALSO</title>
@@ -101,14 +101,15 @@ the selected line.</para>
 <para><userinput>fbscanplot -v -W512 -o `fbpoint -y` &gt; scan.out</userinput>
 <!-- .br -->
 will use
-<command>fbpoint</command>
+<emphasis remap="I">fbpoint</emphasis>
 to select a y scanline, then plot 512 pixel values
 in overlay mode.  These values will also be saved in the file
 <emphasis remap="I">scan.out</emphasis>
 for closer examination.</para>

-<para>A handy C-shell alias is:</para>
-<para>alias fbsp 'fbscanplot -r `fbpoint -y`'</para>
+<para>A handy C-shell alias is:
+<!-- .br -->
+<emphasis remap="I">alias fbsp 'fbscanplot -r `fbpoint -y`'</emphasis></para>
 </refsection>

 <refsection xml:id="see_also"><title>SEE ALSO</title>
@@ -67,7 +67,7 @@ command may be executed by users at a shell prompt, or it may be used as
 an inetd remote framebuffer server by specifying
 <command>fbserv</command>
 as a server program in
-<emphasis remap='B'>inetd.conf</emphasis> .</para>
+<emphasis remap='B'>inetd.conf.</emphasis></para>
 </refsect1>

 <refsect1 xml:id='examples'><title>EXAMPLES</title>
@@ -90,7 +90,7 @@ with it. Any access of a framebuffer specifying port 0 will use the already open
 <para><citerefentry><refentrytitle>bw-fb</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>cat-fb</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>cell-fb</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>cmap-fb</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>gif-fb</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>pix-fb</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>plot3-fb</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>polar-fb</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>rle-fb</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>fbcmap</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>fbcmrot</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>fbclear</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>fbcbars</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>fbanin</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>fbcolor</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>fbfade</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>fbframe</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>fbfree</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>fbgamma</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>fbgrid</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>fbhelp</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>fblabel</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>fbline</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>fbpoint</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>fbscanplot</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>fbstretch</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>fbzoom</refentrytitle><manvolnum>1</manvolnum></citerefentry></para>
+<citerefentry><refentrytitle>fbstretch</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>fbzoom</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
 </refsect1>

 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
@@ -170,16 +170,17 @@ are a good example of this.</para>
 <refsection xml:id="example"><title>EXAMPLE</title>
 <para>The following procedure enlarges an image,
 obtained from a personal computer via the
-<command>gif-fb</command>
+<replaceable>gif-fb</replaceable>
 utility,
 to fill a 1280-by-1024 frame buffer.</para>
  <blockquote remap="RS">
-<para>$ gif-fb <emphasis remap="P-&gt;I">image.gif</emphasis> # displays the 320x200 PC image</para>
-<para>$ fbstretch -w 320 -n 200 -W 1280 -N 1024</para></blockquote> <!-- remap='RE' -->
+<para><emphasis remap="I">$</emphasis> gif-fb image.gif	# <emphasis remap="P-&gt;I">displays the 320x200 PC image</emphasis>
+<!-- .br -->
+<emphasis remap="I">$</emphasis> fbstretch -w 320 -n 200 -W 1280 -N 1024</para></blockquote> <!-- remap='RE' -->
 </refsection>

 <refsection xml:id="see_also"><title>SEE ALSO</title>
-<para><citerefentry><refentrytitle>gif-fb</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>mandel</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>pixscale</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>libfb</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>pix</refentrytitle><manvolnum>5</manvolnum></citerefentry></para>
+<para><citerefentry><refentrytitle>gif-fb</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>mandel</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>pixscale</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>libfb</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>pix</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
 </refsection>

 <refsection xml:id="diagnostics"><title>DIAGNOSTICS</title>
@@ -25,11 +25,11 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>firpass</command> is an interactive program used to create a PRISM ready input
+<para>Firpass is an interactive program used to create a PRISM ready input
 file (when used in conjunction with secpass), a generic thermal data
 file, or a
 geometric properties file.  The following information about each region
-of the mged description may be obtained from <command>firpass</command> when creating a
+of the mged description may be obtained from firpass when creating a
 PRISM ready file.</para>

 <literallayout remap='.nf'>
@@ -32,7 +32,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>g-acad</command>
+<para><emphasis remap='I'>g-acad</emphasis>
 converts the specified
 <emphasis remap='I'>object(s)</emphasis>
 from a BRL-CAD
@@ -75,7 +75,7 @@ option specifies the number of CPU's to be used, and also turns on a flag to ena

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ g-acad -o <emphasis remap='I'>sample.ACAD sample.g sample_object</emphasis>
+$ <emphasis remap='I'>g-acad -o sample.ACAD sample.g sample_object</emphasis>
 </synopsis>
 </refsect1>

@@ -33,7 +33,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>g-dxf</command>
+<para><emphasis remap='I'>g-dxf</emphasis>
 converts the specified
 <emphasis remap='I'>object(s)</emphasis>
 from a BRL-CAD
@@ -50,7 +50,7 @@ option specifies an NMG debug flag. The
 option may be used to specify an absolute tessellation tolerance (in millimeters). This
 requires that the maximum absolute error from the tessellated surface to the actual
 surface must not be greater than
-<emphasis remap='I'>abs_tol</emphasis>.
+<emphasis remap='I'>abs_tol.</emphasis>
 The
 <option>-n</option>
 option specifies a surface normal error tolerance (in degrees) for the tessellation.
@@ -59,7 +59,7 @@ The
 option may be used to set a relative error tolerance. This effectively
 sets an absolute tolerance for each primitive solid by multiplying the
 overall size of the solid by
-<emphasis remap='I'>rel_tol</emphasis>.
+<emphasis remap='I'>rel_tol.</emphasis>
 The
 <option>-D</option>
 option specifies a calculational distance tolerance (mm). Any two vertices
@@ -84,7 +84,7 @@ option specifies the name of the file to receive the output

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ g-dxf -o <emphasis remap='I'>sample.dxf sample.g sample_object</emphasis>
+$ <emphasis remap='I'>g-dxf -o sample.dxf sample.g sample_object</emphasis>
 </synopsis>
 </refsect1>

@@ -16,14 +16,14 @@
 <!-- body begins here -->
 <refsynopsisdiv xml:id='synopsis'>
 <cmdsynopsis>
-  <command>g-egg</command><arg choice='opt'>-v89</arg>
+  <command>g-egg</command><arg choice='opt'>-8 </arg>
    <arg choice='opt'>-xX <replaceable>lvl</replaceable></arg>
+    <arg choice='opt'>-D <replaceable>calculation_tolerance</replaceable></arg>
    <arg choice='opt'>-a <replaceable>abs_tol</replaceable></arg>
    <arg choice='opt'>-r <replaceable>rel_tol</replaceable></arg>
-    <arg choice='opt'>-n <replaceable>norm_tol</replaceable></arg>
-    <arg choice='opt'>-D <replaceable>calculation_tolerance</replaceable></arg>
-    <arg choice='opt'>-o <replaceable>EGG_file</replaceable></arg>
    <arg choice='opt'>-P <replaceable>number_of_CPUs</replaceable></arg>
+    <arg choice='opt'>-n <replaceable>norm_tol</replaceable></arg>
+    <arg choice='opt'>-o <replaceable>EGG_file</replaceable></arg>
    <arg choice='plain'><replaceable>database.g</replaceable></arg>
    <arg choice='plain'><replaceable>object(s)</replaceable></arg>
 </cmdsynopsis>
@@ -31,7 +31,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>g-egg</command>
+<para><emphasis remap='I'>g-egg</emphasis>
 converts the specified
 <emphasis remap='I'>object(s)</emphasis>
 from a BRL-CAD
@@ -44,8 +44,10 @@ The
 option specifies an RT debug flag and the
 <option>-X</option>
 option specifies an NMG debug flag. The
-<option>-a</option>,
-<option>-r</option>, and
+<option>-a</option>
+,
+<option>-r</option>
+, and
 <option>-n</option>
 options specify tessellation tolerances.
 The
@@ -54,7 +56,10 @@ option specifies a calculational distance tolerance (mm). Any two vertices
 that are less than this distance apart will be treated as the same vertex.
 The
 <option>-v</option>
-option requests verbose output, which goes to standard error.
+option requests verbose output.
+The
+<option>-i</option>
+option requests the output file units to be inches (the default is mm).
 The
 <option>-o</option>
 option specifies the name of the file to receive the output
@@ -70,7 +75,7 @@ option specifies the number of CPU's to be used.</para>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ g-egg -o <emphasis remap='I'>sample.egg sample.g sample_object</emphasis>
+$ <emphasis remap='I'>g-egg -o sample.egg sample.g sample_object</emphasis>
 </synopsis>
 </refsect1>

@@ -29,7 +29,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>g-euclid</command>
+<para><emphasis remap='I'>g-euclid</emphasis>
 converts the specified
 <emphasis remap='I'>object(s)</emphasis>
 from a BRL-CAD
@@ -59,7 +59,7 @@ option specifies the name of the file to receive the output

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ g-euclid -o <emphasis remap='I'>sample.euclid sample.g sample_object</emphasis>
+$ <emphasis remap='I'>g-euclid -o sample.euclid sample.g sample_object</emphasis>
 </synopsis>
 </refsect1>

@@ -33,11 +33,11 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>g-iges</command>
+<para><emphasis remap='I'>g-iges</emphasis>
 converts the specified objects of the BRL-CAD database,
-<emphasis remap='I'>database.g</emphasis>,
+<emphasis remap='I'>database.g,</emphasis>
 to an IGES version 5.1 file,
-<emphasis remap='I'>file.iges</emphasis>.</para>
+<emphasis remap='I'>file.iges.</emphasis></para>


 <para>The following options are recognized</para>
@@ -139,8 +139,8 @@ this way).</para>

 <para>If neither the -f , -t , nor the -m options  are  selected,
 the  default is a CSG IGES file. In this situation, all regions will be
-written to the IGES file as Boolean trees with all possible solids
-represented  by their IGES CSG equivalent. In cases where there is no IGES
+written to the IGES file as Boolean trees with all possible solids rep-
+resented  by their IGES CSG equivalent. In cases where there is no IGES
 CSG equivalent, the BRL-CAD solid is  tesellated  (using  the  provided
 tolerances),  and  a  BREP  object  is  written for that solid.</para>

@@ -148,21 +148,21 @@ tolerances),  and  a  BREP  object  is  written for that solid.</para>
 </refsect1>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<para>g-iges -f -o <emphasis remap='I'>gsample.iges sample.g object1</emphasis></para>
+<para><emphasis remap='I'>g-iges -f -o sample.iges sample.g object1</emphasis></para>

 <para>This command will produce an IGES BREP output file,
-<emphasis remap='I'>sample.iges</emphasis>,
+<emphasis remap='I'>sample.iges,</emphasis>
 from
 <emphasis remap='I'>object1</emphasis>
 of the BRL-CAD database file
-<emphasis remap='I'>sample.g</emphasis>.</para>
+<emphasis remap='I'>sample.g.</emphasis></para>
 </refsect1>

 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
-<para><citerefentry><refentrytitle>iges-g</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+<para><citerefentry><refentrytitle>iges-g</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
 <!-- .br -->
-<emphasis remap='I'>The Initial Graphics Exchange Specification (IGES) Version 5.1</emphasis>,
-IGES/PDES Organization, September 1991</para>
+<emphasis remap='I'>The Initial Graphics Exchange Specification (IGES) Version 5.1,</emphasis>
+IGES/PDES Organization, September 1991.</para>
 </refsect1>

 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
@@ -32,7 +32,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>g-nff</command>
+<para><emphasis remap='I'>g-nff</emphasis>
 converts the specified
 <emphasis remap='I'>object(s)</emphasis>
 from a BRL-CAD
@@ -45,8 +45,10 @@ The
 option specifies an RT debug flag and the
 <option>-X</option>
 option specifies an NMG debug flag. The
-<option>-a</option>,
-<option>-r</option>, and
+<option>-a</option>
+,
+<option>-r</option>
+, and
 <option>-n</option>
 options specify tessellation tolerances.
 The
@@ -70,7 +72,7 @@ option specifies a file for receiving the error messages.</para>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ g-nff -o <emphasis remap='I'>sample.nff sample.g sample_object</emphasis>
+$ <emphasis remap='I'>g-nff -o sample.nff sample.g sample_object</emphasis>
 </synopsis>
 </refsect1>

@@ -54,7 +54,7 @@ option is not used.</para>
 <para>Specify an absolute tessellation tolerance (in millimeters).
 This requires that the maximum absolute error from the tessellated surface to the actual
 surface must not be greater than
-<emphasis remap='I'>abs_tess_tol</emphasis>.</para>
+<emphasis remap='I'>abs_tess_tol.</emphasis></para>
  </listitem>
  </varlistentry>
  <varlistentry>
@@ -87,11 +87,11 @@ surface must not be greater than
 <para>Specify a relative error tolerance. This effectively
 sets an absolute tolerance for each primitive solid by multiplying the
 overall size of the solid by
-<emphasis remap='I'>rel_tess_tol</emphasis>.
+<emphasis remap='I'>rel_tess_tol.</emphasis>
 This allows small objects to be tessellated with small tolerances, while large objects are tessellated with large tolerances.
 For example, specifying
 <option>-r 0.1</option>
-when tessellating an object 2m in size will result in a tolerance of .2m (2.0 * 0.1).
+when tessellating an object 2m in size, will result in a tolerance of .2m (2.0 * 0.1).
 The same option will cause a 5cm object to be tessellated with a tolerance of 0.5cm.</para>
  </listitem>
  </varlistentry>
@@ -118,7 +118,7 @@ can be controlled using the tessellation tolerances.</para>
  <listitem>
 <para>Set librt debug flags.
 The definitions of these flags may be found in
-<emphasis remap='I'>raytrace.h</emphasis>.</para>
+<emphasis remap='I'>raytrace.h.</emphasis></para>
  </listitem>
  </varlistentry>
  <varlistentry>
@@ -126,7 +126,13 @@ The definitions of these flags may be found in
  <listitem>
 <para>Set NMG routines debug flags.
 The definitions of these flags may be found in
-<emphasis remap='I'>h/nmg.h</emphasis>.</para>
+<emphasis remap='I'>h/nmg.h.</emphasis></para>
+  </listitem>
+  </varlistentry>
+  <varlistentry>
+  <term><option>-(</option></term>
+  <listitem>
+<para>Set the number of CPUs.</para>
  </listitem>
  </varlistentry>
 </variablelist>
@@ -134,7 +140,7 @@ The definitions of these flags may be found in

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ g-nmg -o <emphasis remap='I'> shell.g sample.g sample_object</emphasis>
+$ <emphasis remap='I'>g-nmg -o shell.g sample.g sample_object</emphasis>
 </synopsis>
 </refsect1>

@@ -33,7 +33,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>g-obj</command>
+<para><emphasis remap='I'>g-obj</emphasis>
 converts the specified
 <emphasis remap='I'>object(s)</emphasis>
 from a BRL-CAD
@@ -93,7 +93,7 @@ option specifies a file for receiving the error messages.</para>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ g-obj -o <emphasis remap='I'>sample.obj sample.g sample_object</emphasis>
+$ <emphasis remap='I'>g-obj -o sample.obj sample.g sample_object</emphasis>
 </synopsis>
 </refsect1>

@@ -37,7 +37,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>g-raw</command>
+<para><emphasis remap='I'>g-raw</emphasis>
 converts the specified
 <emphasis remap='I'>object(s)</emphasis>
 from a BRL-CAD
@@ -134,7 +134,7 @@ less than this distance apart will be treated as the same vertex.</para>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ g-raw -o <emphasis remap='I'>sample.raw sample.g sample_object</emphasis>
+$ <emphasis remap='I'>g-raw -o sample.raw sample.g sample_object</emphasis>
 </synopsis>
 </refsect1>

@@ -35,7 +35,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>g-shell-rect</command>
+<para><emphasis remap='I'>g-shell-rect</emphasis>
 converts the specified
 <emphasis remap='I'>objects(s)</emphasis>
 from a BRL-CAD model
@@ -50,19 +50,19 @@ by specifying a desired initial ray direction using the
 option (see below).
 The initial shell is constructed using only the first and last
 intersections with the
-<emphasis remap='I'>object(s)</emphasis>.
+<emphasis remap='I'>object(s).</emphasis>
 This will typically result in some rather large faces with normals at right angles
 to the ray direction. Unless the
 <option>-n</option>
 option is specified, these faces are then subdivided (according to the
-<emphasis remap='I'>cell_size</emphasis>)
-and additional rays fired from the other two directions are used to refine their
+<emphasis remap='I'>cell_size</emphasis>
+) and additional rays fired from the other two directions are used to refine their
 shape.
 The resulting NMG solid
 will be named
 <emphasis remap='I'>shell</emphasis>
 and will be written to the specified
-<emphasis remap='I'>brlcad_output_file</emphasis>.</para>
+<emphasis remap='I'>brlcad_output_file.</emphasis></para>


 <para>The following command line options are recognized:</para>
@@ -134,7 +134,7 @@ most hits first.</para>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ g-shell-rect -o <emphasis remap='I'>shell.g sample.g sample_object</emphasis>
+$ <emphasis remap='I'>g-shell-rect -o shell.g sample.g sample_object</emphasis>
 </synopsis>
 </refsect1>

@@ -24,11 +24,11 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>g-step</command>
+<para><emphasis remap='I'>g-step</emphasis>
 converts the specified objects of the BRL-CAD database,
-<emphasis remap='I'>database.g</emphasis>,
+<emphasis remap='I'>database.g,</emphasis>
 to a STEP AP203 file,
-<emphasis remap='I'>output_file.stp</emphasis>.</para>
+<emphasis remap='I'>output_file.stp.</emphasis></para>


 <para>The following options are recognized</para>
@@ -63,7 +63,7 @@ to a STEP AP203 file,
 			<userinput>g-step -o m35.stp m35.g</userinput>
 		</para>
 		<para>
-			Writes out the full hierarchy of the .g file to m35.stp .
+			Writes out the full hierarchy of the .g file to m35.stp.
 		</para>
 	</example>

@@ -86,7 +86,7 @@ to a STEP AP203 file,
  <listitem>
 	  <para>
 		  <emphasis remap='I'>Recommended Practices for AP203</emphasis>
-		  PDES, Inc. Industry consortium, April 1998
+		  PDES, Inc. Industry consortium, April 1998.
 	  </para>
  </listitem>
  </varlistentry>
@@ -95,7 +95,7 @@ to a STEP AP203 file,
  <listitem>
 	  <para>
 		  <emphasis remap='I'>Usage Guide for the STEP PDM Schema V1.2</emphasis>
-		  PDM Implementer Forum, Release 4.3, January 2002
+		  PDM Implementer Forum, Release 4.3, January 2002.
 	  </para>
  </listitem>
  </varlistentry>
@@ -38,7 +38,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>g-stl</command>
+<para><emphasis remap='I'>g-stl</emphasis>
 converts the specified
 <emphasis remap='I'>object(s)</emphasis>
 from a BRL-CAD
@@ -144,7 +144,7 @@ less than this distance apart will be treated as the same vertex.</para>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ g-stl -o <emphasis remap='I'>sample.stl sample.g sample_object</emphasis>
+$ <emphasis remap='I'>g-stl -o sample.stl sample.g sample_object</emphasis>
 </synopsis>
 </refsect1>

@@ -35,7 +35,7 @@

 	<refsection xml:id='description'>
 		<title>DESCRIPTION</title>
-		<para><command>g-tankill</command>
+		<para><emphasis remap='I'>g-tankill</emphasis>
 			converts the specified
 			<emphasis remap='I'>object(s)</emphasis>
 			from a BRL-CAD
@@ -84,11 +84,11 @@
 		</para>
 	</refsection>

-<refsection xml:id='example'><title>EXAMPLE</title>
-<synopsis>
-$ g-tankill -o <emphasis remap='I'>sample.tankill sample.g sample_object</emphasis>
-</synopsis>
-</refsection>
+	<refsection xml:id='example'><title>EXAMPLE</title>
+		<synopsis>
+			$ <emphasis remap='I'>g-tankill -o sample.tankill sample.g sample_object</emphasis>
+		</synopsis>
+	</refsection>

 	<refsection xml:id='diagnostics'><title>DIAGNOSTICS</title>
 		<para>Error messages are intended to be self-explanatory.</para>
@@ -36,7 +36,7 @@ writes the bag of triangle (BOT) primitives of the specified
 in a binary array format to
 <emphasis remap='I'>outfile</emphasis>
 or to
-<emphasis remap='I'>stdout</emphasis>.</para>
+<emphasis remap='I'>stdout.</emphasis></para>
 </refsect1>

 <refsect1 xml:id='options'><title>OPTIONS</title>
@@ -54,11 +54,11 @@ or to
  </listitem>
  </varlistentry>
  <varlistentry>
-  <term><option>-s</option> <userinput>scale</userinput></term>
+  <term><option>-s scale</option></term>
  <listitem>
 <para>Scale the output geometry by factor
-<emphasis remap='I'>scale</emphasis>.
-By default the scale factor is 0.001 (standard transformation
+<emphasis remap='B'>scale</emphasis>
+. By default the scale factor is 0.001 (standard transformation
 from meters to millimeters).</para>
  </listitem>
  </varlistentry>
@@ -69,12 +69,11 @@ from meters to millimeters).</para>
  </listitem>
  </varlistentry>
  <varlistentry>
-  <term><option>-o </option><emphasis remap='I'>outfile</emphasis></term>
-
+  <term><option>-o outfile</option></term>
  <listitem>
 <para>The output will be written to
-<emphasis remap='I'>outfile</emphasis>.
-By default the output is written to stdout.</para>
+<emphasis remap='B'>outfile</emphasis>
+. By default the output is written to stdout.</para>
  </listitem>
  </varlistentry>
 </variablelist>
@@ -86,7 +85,7 @@ By default the output is written to stdout.</para>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ g-var -o <emphasis remap='I'>sample.mesh sample.g sample_object</emphasis>
+$ <emphasis remap='I'>g-var -o sample.mesh sample.g sample_object</emphasis>
 </synopsis>
 </refsect1>

@@ -58,7 +58,7 @@ can be controlled using the tessellation tolerances. The
 option may be used to specify an absolute tessellation tolerance (in millimeters). This
 requires that the maximum absolute error from the tessellated surface to the actual
 surface must not be greater than
-<emphasis remap='I'>abs_tess_tol</emphasis>.
+<emphasis remap='I'>abs_tess_tol.</emphasis>
 The
 <option>-n</option>
 option specifies a surface normal error tolerance (in degrees) for the tessellation.
@@ -67,7 +67,7 @@ The
 option may be used to set a relative error tolerance. This effectively
 sets an absolute tolerance for each primitive solid by multiplying the
 overall size of the solid by
-<emphasis remap='I'>rel_tess_tol</emphasis>.
+<emphasis remap='I'>rel_tess_tol.</emphasis>
 The
 <option>-x</option>
 and
@@ -79,7 +79,7 @@ and the
 routines respectively. The definitions of these flags may be found in
 <emphasis remap='I'>raytrace.h</emphasis>
 and
-<emphasis remap='I'>nmg.h</emphasis>.
+<emphasis remap='I'>nmg.h.</emphasis>
 The
 <option>-u</option>
 option can be used to set the units for the resulting VRML file (the default is mm).
@@ -95,7 +95,7 @@ option provides evaluation of all CSG and BOTs.  They are mutually exclusive.

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ g-vrml -o <emphasis remap='I'>shell.wrl sample.g sample_object</emphasis>
+$ <emphasis remap='I'>g-vrml -o shell.wrl sample.g sample_object</emphasis>
 </synopsis>
 </refsect1>

@@ -59,7 +59,7 @@ can be controlled using the tessellation tolerances. The
 option may be used to specify an absolute tessellation tolerance (in millimeters). This
 requires that the maximum absolute error from the tessellated surface to the actual
 surface must not be greater than
-<emphasis remap='I'>abs_tess_tol</emphasis>.
+<emphasis remap='I'>abs_tess_tol.</emphasis>
 The
 <option>-n</option>
 option specifies a surface normal error tolerance (in degrees) for the tessellation.
@@ -68,7 +68,7 @@ The
 option may be used to set a relative error tolerance. This effectively
 sets an absolute tolerance for each primitive solid by multiplying the
 overall size of the solid by
-<emphasis remap='I'>rel_tess_tol</emphasis>.
+<emphasis remap='I'>rel_tess_tol.</emphasis>
 The
 <option>-x</option>
 and
@@ -80,7 +80,7 @@ and the
 routines respectively. The definitions of these flags may be found in
 <emphasis remap='I'>raytrace.h</emphasis>
 and
-<emphasis remap='I'>nmg.h</emphasis>.
+<emphasis remap='I'>nmg.h</emphasis> .
 The
 <option>-u</option>
 option can be used to set the units for the resulting X3D file (the default is mm).
@@ -94,7 +94,7 @@ option sets the number of processors (default is 1).

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ g-x3d -o <emphasis remap='I'>shell.x3d sample.g sample_object</emphasis>
+$ <emphasis remap='I'>g-x3d -o shell.x3d sample.g sample_object</emphasis>
 </synopsis>
 </refsect1>

@@ -24,9 +24,9 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><emphasis remap='B'><command>g2asc</command></emphasis> is a utility provided by BRL-CAD used to convert <emphasis remap='I'><command>mged(1)</command></emphasis> geometry databases in binary format to ASCII form to be later converted back by <emphasis remap='I'><command>asc2g(1)</command></emphasis>. Databases in the new format will be converted to the new (Tcl script) ASCII format and databases in the old format will be converted to the old ASCII format (see <emphasis remap='B'>HISTORY</emphasis>).</para>
+<para><emphasis remap='B'><command>g2asc</command></emphasis> is a utility provided by BRL-CAD used to convert <emphasis remap='I'><command>mged(1)</command></emphasis> geometry databases in binary format to ASCII form to be later converted back by <emphasis remap='I'><command>asc2g(1)</command></emphasis>. Databases in the new format will be converted to the new (Tcl script) ASCII format and databases in the old format will be converted to the old ASCII format (See <emphasis remap='B'>HISTORY</emphasis>).</para>

-<para>The local machine binary representation of a mged database is inherently non-portable. <emphasis remap='I'><command>g2asc</command></emphasis> and its converse, <emphasis remap='I'><command>asc2g</command></emphasis> , are simple filters which convert between the binary form and an ASCII representation.</para>
+<para>The local machine binary representation of a mged database is inherently non-portable. <emphasis remap='I'><command>g2asc</command></emphasis>, along with its converse <emphasis remap='I'><command>asc2g</command></emphasis> are simple filters which convert between the binary form and an ASCII representation.</para>

 <para>This was traditionally performed so the files could be transferred to another machine in a portable format.  Although no longer necessary for the current binary geometry database files that  are  created by  mged  ("v5"  format), the conversion process is still necessary if manipulating older ("v4" format) geometry database files.</para>

@@ -34,19 +34,19 @@


 <refsect1 xml:id='examples'><title>EXAMPLE</title>
-<para>g2asc <emphasis remap='I'>file.g file.asc</emphasis></para>
+<para><emphasis remap='B'><command>g2asc</command></emphasis> <emphasis remap='I'>file.g file.asc</emphasis></para>
  <blockquote remap='RS'>
-  <para>On the local machine, convert the mged databases to ASCII using <emphasis remap='I'><command>g2asc</command></emphasis> .
+  <para>On the local machine, convert the mged databases to ASCII using <emphasis remap='I'><command>g2asc</command></emphasis>
  </para></blockquote> <!-- remap='RE' -->

 <para>scp <emphasis remap='I'>file.asc</emphasis> remote:<emphasis remap='I'>file.asc</emphasis></para>
 <blockquote remap='RS'>
-  <para>Transfer the converted databases to the remote machine.
+  <para>Transfer the converted databases to the remote machine
  </para></blockquote> <!-- remap='RE' -->

-<para>ssh remote "asc2g <emphasis remap='I'>file.asc file.g</emphasis>"</para>
+<para>ssh remote "<emphasis remap='B'><command>asc2g</command></emphasis> <emphasis remap='I'>file.asc file.g</emphasis>"</para>
  <blockquote remap='RS'>
-  <para>On the remote machine, convert the files back to the binary representation for that machine using <emphasis remap='I'><command>asc2g</command></emphasis> .
+  <para>On the remote machine, convert the files back to the binary representation for that machine using <emphasis remap='I'><command>asc2g</command></emphasis>
  </para></blockquote> <!-- remap='RE' -->

 </refsect1>
@@ -105,6 +105,6 @@


 <refsect1 xml:id='disclaimer'><title>DISCLAIMER</title>
-<para>The ASCII representation of BRL-CAD geometry databases is not a fixed format and is allowed to change without deprecation notice. In general, this will not occur any more frequently than the binary geometry database format changes, though both are open specifications. Regardless, the ASCII representation is subject to change without notice and should not be relied upon by external codes. (See <emphasis remap='B'>HISTORY</emphasis>.)</para>
+<para>The ASCII representation of BRL-CAD geometry databases is not a fixed format and is allowed to change without deprecation notice. In general, this will not occur any more frequently than the binary geometry database format changes, though both are open specifications. Regardless, the ASCII representation is subject to change without notice and should not be relied upon by external codes. (See <emphasis remap='B'>HISTORY</emphasis>).</para>
 </refsect1>
 </refentry>
@@ -26,19 +26,18 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>g_diff</command>
+<para><emphasis remap='I'>G_diff</emphasis>
 compares the two BRL-CAD models specified on the command line. The results of this comparison
 are written to standard out in a human readable form describing the changes from model1 to model2.
 If the
 <option>-m</option>
-option is exercised, the output will be a script, readable by <command>mged(1)</command>, that will perform the
+option is exercised, the output will be a script, readable by mged(1), that will perform the
 necessary changes to model1 to make it a copy of model2. The produced script makes extensive use
 of the
-<emphasis remap='I'>db get</emphasis>,
-<emphasis remap='I'>db put</emphasis>,
+<emphasis remap='I'>db get, db put,</emphasis>
 and
 <emphasis remap='I'>db adjust</emphasis>
-commands in <command>mged(1)</command>. A few solid types are not supported by these commands, and changes involving these
+commands in mged(1). A few solid types are not supported by these commands, and changes involving these
 solids are merely noted (the script will not actually be capable of performing all the changes in this case).
 The
 <option>-e</option>
@@ -60,11 +59,11 @@ consistency. Any inconsistencies are written to stderr.</para>
 <para>The command</para>

 <!-- .in +5 -->
-<para>g_diff -m uncle.g aunt.g &gt; mged.script</para>
+<para><emphasis remap='I'>g_diff -m uncle.g aunt.g &gt; mged.script</emphasis></para>
 <!-- .in &bsol;-5 -->

-<para>will create a file named "mged.script" that may be sourced in <command>mged(1)</command> to change
-uncle.g into aunt.g .</para>
+<para>will create a file named "mged.script" that may be sourced in mged(1) to change
+uncle.g into aunt.g.</para>
 </refsect1>

 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
@@ -25,7 +25,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>g_lint</command>
+<para><emphasis remap='I'>G_lint</emphasis>
 uses
 <citerefentry><refentrytitle>librt</refentrytitle><manvolnum>3</manvolnum></citerefentry>
 to fire an array of parallel rays
@@ -185,7 +185,7 @@ to produce its reports as
 <emphasis remap='I'>plot3(5)</emphasis>
 drawing commands instead of ASCII text.
 This is useful in conjunction with the "overlay" command of
-<emphasis remap='I'>mged</emphasis>.</para>
+<emphasis remap='I'>mged.</emphasis></para>
  </listitem>
  </varlistentry>
  <varlistentry>
@@ -283,7 +283,7 @@ ignores air regions.</para>
 <para>Sets the
 <command>g_lint</command>
 debug flags to
-<emphasis remap='I'>bits</emphasis>.
+<emphasis remap='I'>bits.</emphasis>
 See the
 <option>-r</option>
 option
@@ -299,7 +299,7 @@ Note that some of the report types have no corresponding diagnostics.</para>
 <para>The command</para>

 <!-- .in +5 -->
-<para>g_lint -a 35 -e 25 -c -g 1 -r 31 -t 0.01 <emphasis remap='I'>kitchen.g appliances</emphasis></para>
+<para><emphasis remap='I'>g_lint -a 35 -e 25 -c -g 1 -r 31 -t 0.01 kitchen.g appliances</emphasis></para>
 <!-- .in &bsol;-5 -->

 <para>fires a ray every millimeter and produces overlap reports
@@ -26,7 +26,7 @@

 	<refsect1 xml:id='description'><title>DESCRIPTION</title>
 		<para>
-			<command>gdiff2</command> compares BRL-CAD models
+			<emphasis remap='I'>gdiff2</emphasis> compares BRL-CAD models
 			specified on the command line, reporting differences according to the
 			specified options.  It supports a plain "diff" comparison between two
 			files, as well as a "3-way" comparison that accepts a third file with
@@ -37,31 +37,23 @@
 		<variablelist remap="TP">
 			<varlistentry>
 				<term><option>-a</option></term>
-				<listitem>
-                                    <para>(two-way diff) Report objects added in right_model.g</para>
-				    <para>(three-way diff) Report objects added in left_model.g and/or right_model.g</para>
-                                </listitem>
+				<listitem><para>Report objects added in model2.g</para></listitem>
 			</varlistentry>
 			<varlistentry>
-				<term><option>-d</option></term>
-	                        <listitem>
-                                    <para>(two-way diff) Report objects deleted in right_model.g</para>
-				    <para>(three-way diff) Report objects deleted in left_model.g and/or right_model.g</para>
-                                </listitem>
+				<term><option>-r</option></term>
+				<listitem><para>Report objects removed in model2.g</para></listitem>
 			</varlistentry>
 			<varlistentry>
-				<term><option>-m</option></term>
-	                        <listitem>
-                                    <para>(two-way diff) Report objects modified in right_model.g</para>
-				    <para>(three-way diff) Report objects that are different in left_model.g and/or right_model.g relative to ancestor.g</para>
-                                </listitem>
+				<term><option>-c</option></term>
+				<listitem><para>Report objects changed in model2.g</para></listitem>
 			</varlistentry>
 			<varlistentry>
 				<term><option>-u</option></term>
-	                        <listitem>
-                                    <para>(two-way diff) Report objects that are identical in left_model.g and right_model.g</para>
-                                    <para>(three-way diff) Report objects that are identical in ancestor_model.g, left_model.g and right_model.g</para>
-                                </listitem>
+				<listitem><para>Report objects that are the same in both model1.g and model2.g</para></listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>-C</option></term>
+				<listitem><para>Report objects with conflicts</para></listitem>
 			</varlistentry>
 			<varlistentry>
 				<term><option>-v #</option></term>
@@ -92,222 +84,65 @@

  <example><title>Default Diffing Results</title>
        <para>
-          Running the default options on two pre-prepared examples of Moss World gives us a summary of the status of various objects:
+          Running the default options on two pre-prepared examples of Moss World gives us full details:
          <literallayout>
                <computeroutput>
 <prompt>~:</prompt><userinput> gdiff2 moss.g moss2.g</userinput>
-M platform.r
-M ellipse.s
-M light.r
-M _GLOBAL
-M cone.s
-M cone.r
-M box.s
-M tor.r
-D LIGHT
-A tgc_new.s
-A eto.s
-		</computeroutput>
+tor2 was added.
+
+cone.s was changed:
+   Parameters changed:
+      D: "1.453863143920999911884451 1.453863143920999911884451 0" -> "2.921497127500571444613797 2.921497127500571444613797 0"
+
+box.s was changed:
+   Parameters changed:
+      V2: "30.0283355712900004164112 21.58122539520000060520033 -16.37908935547000055521494" -> "30.0283355712900004164112 19.1837000000000017507773 -16.37908935547000055521494"
+      V3: "30.0283355712900004164112 21.58122539520000060520033 10.41366577147999805674772" -> "30.0283355712900004164112 19.1837000000000017507773 10.41366577147999805674772"
+      V6: "3.235580444340001804448548 21.58122539520000060520033 -16.37908935547000055521494" -> "3.235580444340001804448548 19.1837000000000017507773 -16.37908935547000055521494"
+      V7: "3.235580444340001804448548 21.58122539520000060520033 10.41366577147999805674772" -> "3.235580444340001804448548 19.1837000000000017507773 10.41366577147999805674772"
+
+tor.r was changed:
+   Parameters changed:
+      tree: "l tor" -> "l tor2"
+
+tor was changed:
+   Parameters changed:
+      r_h: "5.079999923705999620437979" -> "8.882757536664964703732039"
+
+                </computeroutput>
          </literallayout>
-          'M' denotes an object that was modified, 'D' is an object that was deleted, and 'A' is an object that was added.
+          The reporting order is added, removed, and then changed.  So we see that one object was added, none were removed, and four were changed.
        </para>
-   </example>
-
-   <example><title>Alternate Diffing Result Outputs</title>
-	   <para>
-		   The <option>v</option> provides various styles of output, as follows:
-	   </para>
-	   <para>
-		   <option>-v 0</option> (no output except the return code):
-		   <literallayout>
-			   <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 -v 0 moss.g moss2.g</userinput>
-			   </computeroutput>
-		   </literallayout>
-	   </para>
-
-	   <para>
-		   <option>-v 1</option>:
-		   <literallayout>
-			   <computeroutput>
+  </example>
+  <example><title>Quieter Diffing Results</title>
+        <para>
+          Running the same comparison as the previous example with a less verbose output gives us a summary, which is useful when first studying two files to identify differences:
+          <literallayout>
+                <computeroutput>
 <prompt>~:</prompt><userinput> gdiff2 -v 1 moss.g moss2.g</userinput>
-Added:
-tgc_new.s, eto.s

-Removed:
-LIGHT
+Objects added:
+tor2

-Changed:
-platform.r, ellipse.s, light.r, _GLOBAL, cone.s, cone.r, box.s, tor.r
-			   </computeroutput>
-		   </literallayout>
-		   Objects are reported in lists, categorized by their status.
-	   </para>
+Objects changed:
+cone.s, box.s, tor.r, tor

-	   <para>
-		   <option>-v 2</option> (default):
-		   <literallayout>
-			   <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 -v 2 moss.g moss2.g</userinput>
-M platform.r
-M ellipse.s
-M light.r
-M _GLOBAL
-M cone.s
-M cone.r
-M box.s
-M tor.r
-D LIGHT
-A tgc_new.s
-A eto.s
-			   </computeroutput>
-		   </literallayout>
-		   If verbosity is not specified, this is the default output.
-	   </para>
-
-	   <para>
-		   <option>-v 3</option>:
-		   <literallayout>
-			   <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 -v 3 moss.g moss2.g</userinput>
- "platform.r" tree(p): l platform.s
-+ "platform.r" tree(p): - {l platform.s} {l cone.s}
- "ellipse.s" C(p): 0 8.980256080627000869753829 8.980256080627000869753829
-+ "ellipse.s" C(p): 0 1.561016355403846755933728 1.561016355403846755933728
- "ellipse.s" A(p): 14.87607192992999927128039 0 0
-+ "ellipse.s" A(p): 5.559274328313033919357622 0 0
- "light.r" tree(p): l LIGHT
-+ "light.r" tree(p): u {l eto.s} {l cone.s}
- "_GLOBAL" title(a): Gary Moss's "World on a Platter"
-+ "_GLOBAL" title(a): Gary Moss's "World on a Platter" - diff 01
- "cone.s" H(p): 0 0 26.44671630858999833435519
-+ "cone.s" H(p): 0 0 37.49945872348094155768194
- "cone.s" V(p): 16.87542724608999833435519 -34.74353027344000111042988 -16.37908935547000055521494
-+ "cone.s" V(p): -23.07777996602787595747941 -46.52170066332633524552875 -19.26697361191882151842947
- "cone.r" tree(p): l cone.s
-+ "cone.r" tree(p): l cone.s {1 0 0 53.2994  0 1 0 10.1428  0 0 1 0  0 0 0 1}
- "box.s" V4(p): 30.0283355712900004164112 -5.211529731749999783119165 10.41366577147999805674772
-+ "box.s" V4(p): 29.46579237282375984818827 -5.211529731749999783119165 10.41366577147999805674772
- "box.s" V3(p): 30.0283355712900004164112 21.58122539520000060520033 10.41366577147999805674772
-+ "box.s" V3(p): 29.46579237282375984818827 21.58122539520000060520033 10.41366577147999805674772
- "box.s" V2(p): 30.0283355712900004164112 21.58122539520000060520033 -16.37908935547000055521494
-+ "box.s" V2(p): 29.46579237282375984818827 21.58122539520000060520033 -16.37908935547000055521494
- "box.s" V1(p): 30.0283355712900004164112 -5.211529731749999783119165 -16.37908935547000055521494
-+ "box.s" V1(p): 29.46579237282375984818827 -5.211529731749999783119165 -16.37908935547000055521494
- "tor.r" tree(p): l tor
-+ "tor.r" tree(p): l tor {1 0 0 8.44652  0 1 0 -56.3571  0 0 1 54.4836  0 0 0 2.71809}
-D LIGHT
-A tgc_new.s
-A eto.s
-			   </computeroutput>
-		   </literallayout>
-		   Verbosity 3 is a more detailed version of the previous setting, with each parameter in the modified objects reported in detail.  '-' lines
-                   show what was removed for a given attribute or parameter, and '+' lines contain the data that replaced them.
-	   </para>
-
-
-	   <para>
-		   <option>-v 4</option>:
-		   <literallayout>
-			   <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 -v 4 moss.g moss2.g</userinput>
- "platform.r" tree(p): l platform.s
-+ "platform.r" tree(p): - {l platform.s} {l cone.s}
- "ellipse.s" C(p): 0 8.980256080627000869753829 8.980256080627000869753829
-+ "ellipse.s" C(p): 0 1.561016355403846755933728 1.561016355403846755933728
- "ellipse.s" A(p): 14.87607192992999927128039 0 0
-+ "ellipse.s" A(p): 5.559274328313033919357622 0 0
- "light.r" tree(p): l LIGHT
-+ "light.r" tree(p): u {l eto.s} {l cone.s}
- "_GLOBAL" title(a): Gary Moss's "World on a Platter"
-+ "_GLOBAL" title(a): Gary Moss's "World on a Platter" - diff 01
- "cone.s" H(p): 0 0 26.44671630858999833435519
-+ "cone.s" H(p): 0 0 37.49945872348094155768194
- "cone.s" V(p): 16.87542724608999833435519 -34.74353027344000111042988 -16.37908935547000055521494
-+ "cone.s" V(p): -23.07777996602787595747941 -46.52170066332633524552875 -19.26697361191882151842947
- "cone.r" tree(p): l cone.s
-+ "cone.r" tree(p): l cone.s {1 0 0 53.2994  0 1 0 10.1428  0 0 1 0  0 0 0 1}
- "box.s" V4(p): 30.0283355712900004164112 -5.211529731749999783119165 10.41366577147999805674772
-+ "box.s" V4(p): 29.46579237282375984818827 -5.211529731749999783119165 10.41366577147999805674772
- "box.s" V3(p): 30.0283355712900004164112 21.58122539520000060520033 10.41366577147999805674772
-+ "box.s" V3(p): 29.46579237282375984818827 21.58122539520000060520033 10.41366577147999805674772
- "box.s" V2(p): 30.0283355712900004164112 21.58122539520000060520033 -16.37908935547000055521494
-+ "box.s" V2(p): 29.46579237282375984818827 21.58122539520000060520033 -16.37908935547000055521494
- "box.s" V1(p): 30.0283355712900004164112 -5.211529731749999783119165 -16.37908935547000055521494
-+ "box.s" V1(p): 29.46579237282375984818827 -5.211529731749999783119165 -16.37908935547000055521494
- "tor.r" tree(p): l tor
-+ "tor.r" tree(p): l tor {1 0 0 8.44652  0 1 0 -56.3571  0 0 1 54.4836  0 0 0 2.71809}
-D "LIGHT" C(p): 0 0 2.539999961852999810218989
-D "LIGHT" B(p): 0 2.539999961852999810218989 0
-D "LIGHT" A(p): 2.539999961852999810218989 0 0
-D "LIGHT" V(p): 20.15756225586000027760747 -13.52595329284999969843284 5.034742355347000319909512
-D "LIGHT" DB5_MINORTYPE(p): ell
-A "tgc_new.s" D(p): 0 500 0
-A "tgc_new.s" C(p): 250 0 0
-A "tgc_new.s" B(p): 0 250 0
-A "tgc_new.s" A(p): 500 0 0
-A "tgc_new.s" H(p): 0 0 2000
-A "tgc_new.s" V(p): 0 0 -1000
-A "tgc_new.s" DB5_MINORTYPE(p): tgc
-A "eto.s" r_d(p): 1.724149328000026404339451
-A "eto.s" r(p): 13.79319462400021123471561
-A "eto.s" C(p): 3.448298656000062134552309 0 3.448298656000062134552309
-A "eto.s" N(p): 0 0 0.01724149328000028000285049
-A "eto.s" V(p): 8.533195938359670051909234 -11.04524849332910996224655 -1.403988582132086548881489
-A "eto.s" DB5_MINORTYPE(p): eto
-			   </computeroutput>
-		   </literallayout>
-		   Verbosity 4 is a fully detailed diff that contains all information added or removed.
-	   </para>
-
-   </example>
-
-
-  <example><title>Filtering Based on Difference Type</title>
-        <para>
-          The options <option>a</option>, <option>d</option>, <option>m</option>, and <option>u</option> control
-          which categories of diff results (added, deleted, modified, and unchanged) are reported. By default
-          added, deleted and modified items are reported, but once one of these four options is specified only
-          those specified are reported:
-        </para>
-        <para>
-          Report only objects added:
-          <literallayout>
-                <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 -a moss.g moss2.g</userinput>
-A tgc_new.s
-A eto.s
                </computeroutput>
          </literallayout>
        </para>
+  </example>
+  <example><title>Filtering Results With Search Filters</title>
        <para>
-          Report only objects deleted:
+          Let's say, for example, we want a detailed diff output but only for object of type torus.  We can filter for such results with the <option>F</option> option:
          <literallayout>
                <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 -d moss.g moss2.g</userinput>
-D LIGHT
-                </computeroutput>
-          </literallayout>
-        </para>
-        <para>
-          Report both added and deleted objects, but not modified objects:
-          <literallayout>
-                <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 -a -d moss.g moss2.g</userinput>
-D LIGHT
-A tgc_new.s
-A eto.s
-                </computeroutput>
-          </literallayout>
-        </para>
-        <para>
-          Report unmodified objects:
-          <literallayout>
-                <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 -u moss.g moss2.g</userinput>
-  ellipse.r
-  box.r
-  all.g
+<prompt>~:</prompt><userinput> gdiff2 -F "-type tor" moss.g moss2.g</userinput>
+tor2 was added.
+
+tor was changed:
+   Parameters changed:
+      r_h: "5.079999923705999620437979" -> "8.882757536664964703732039"
+
                </computeroutput>
          </literallayout>
        </para>
@@ -315,57 +150,20 @@ A eto.s

  <example><title>Filtering Results With Tolerance</title>
        <para>
-          To eliminate differences in modifications that are too small to be of interest, the <option>t</option> is used.  What
-          difference constitutes "too small" is up to the user - in this example, we will use 30 millimeters:
+          To eliminate differences that are too small to be of interest, the <option>t</option> is used.  What is "too small" is up to the user - in this example, we will use three millimeters:
          <literallayout>
                <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 -v 3 -t 30.0 moss.g moss2.g</userinput>
- "platform.r" tree(p): l platform.s
-+ "platform.r" tree(p): - {l platform.s} {l cone.s}
- "light.r" tree(p): l LIGHT
-+ "light.r" tree(p): u {l eto.s} {l cone.s}
- "_GLOBAL" title(a): Gary Moss's "World on a Platter"
-+ "_GLOBAL" title(a): Gary Moss's "World on a Platter" - diff 01
- "cone.s" V(p): 16.87542724608999833435519 -34.74353027344000111042988 -16.37908935547000055521494
-+ "cone.s" V(p): -23.07777996602787595747941 -46.52170066332633524552875 -19.26697361191882151842947
- "cone.r" tree(p): l cone.s
-+ "cone.r" tree(p): l cone.s {1 0 0 53.2994  0 1 0 10.1428  0 0 1 0  0 0 0 1}
- "tor.r" tree(p): l tor
-+ "tor.r" tree(p): l tor {1 0 0 8.44652  0 1 0 -56.3571  0 0 1 54.4836  0 0 0 2.71809}
-D LIGHT
-A tgc_new.s
-A eto.s
-		</computeroutput>
-	</literallayout>
-	Notice that ellipse.s, which was on earlier lists, is now filtered out.  cone.s has a difference in the x coordinates
-	of the parameter V that is large enough to satisfy the tolerance filter, so that parameter stays in.  Parameters that
-	are not strictly numerical comparisons, or those that are part of added or deleted objects, remain in the report.
-        </para>
-  </example>
+<prompt>~:</prompt><userinput> gdiff2 -t 3.0 moss.g moss2.g</userinput>
+tor2 was added.

+tor.r was changed:
+   Parameters changed:
+      tree: "l tor" -> "l tor2"
+
+tor was changed:
+   Parameters changed:
+      r_h: "5.079999923705999620437979" -> "8.882757536664964703732039"

-  <example><title>Filtering Results With Search Filters</title>
-        <para>
-          The <emphasis>search</emphasis> filtering technique can be used to select specific subsets of the database to see
-          in reports, using the <option>F</option> option.  For example, limiting the diff report to only objects of type elliptical torus:
-          <literallayout>
-                <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 -F "-type eto" moss.g moss2.g</userinput>
-A eto.s
-                </computeroutput>
-          </literallayout>
-        </para>
-        <para>
-          Note that this option will work at all levels of verbosity:
-          <literallayout>
-                <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 -v 4 -F "-type eto" moss.g moss2.g</userinput>
-A "eto.s" r_d(p): 1.724149328000026404339451
-A "eto.s" r(p): 13.79319462400021123471561
-A "eto.s" C(p): 3.448298656000062134552309 0 3.448298656000062134552309
-A "eto.s" N(p): 0 0 0.01724149328000028000285049
-A "eto.s" V(p): 8.533195938359670051909234 -11.04524849332910996224655 -1.403988582132086548881489
-A "eto.s" DB5_MINORTYPE(p): eto
                </computeroutput>
          </literallayout>
        </para>
@@ -373,261 +171,19 @@ A "eto.s" DB5_MINORTYPE(p): eto

  <example><title>Combining Multiple Filters</title>
        <para>
-          The various diff filters can be used together.  For example, repeating the search
-          filter with ell types added to the accepted list produces the following:
+          To return *only* results that are large changes, we can apply multiple filters to the output:
          <literallayout>
                <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 -v 4 -F "-type eto -or -type ell" moss.g moss2.g</userinput>
- "ellipse.s" C(p): 0 8.980256080627000869753829 8.980256080627000869753829
-+ "ellipse.s" C(p): 0 1.561016355403846755933728 1.561016355403846755933728
- "ellipse.s" A(p): 14.87607192992999927128039 0 0
-+ "ellipse.s" A(p): 5.559274328313033919357622 0 0
-D "LIGHT" C(p): 0 0 2.539999961852999810218989
-D "LIGHT" B(p): 0 2.539999961852999810218989 0
-D "LIGHT" A(p): 2.539999961852999810218989 0 0
-D "LIGHT" V(p): 20.15756225586000027760747 -13.52595329284999969843284 5.034742355347000319909512
-D "LIGHT" DB5_MINORTYPE(p): ell
-A "eto.s" r_d(p): 1.724149328000026404339451
-A "eto.s" r(p): 13.79319462400021123471561
-A "eto.s" C(p): 3.448298656000062134552309 0 3.448298656000062134552309
-A "eto.s" N(p): 0 0 0.01724149328000028000285049
-A "eto.s" V(p): 8.533195938359670051909234 -11.04524849332910996224655 -1.403988582132086548881489
-A "eto.s" DB5_MINORTYPE(p): eto
-                </computeroutput>
-          </literallayout>
-        </para>
-        <para>
-          If we now add the tolerance filter, we see ellipse.s is filtered out:
-          <literallayout>
-                <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 -v 4 -t 30.0 -F "-type eto -or -type ell" moss.g moss2.g</userinput>
-D "LIGHT" C(p): 0 0 2.539999961852999810218989
-D "LIGHT" B(p): 0 2.539999961852999810218989 0
-D "LIGHT" A(p): 2.539999961852999810218989 0 0
-D "LIGHT" V(p): 20.15756225586000027760747 -13.52595329284999969843284 5.034742355347000319909512
-D "LIGHT" DB5_MINORTYPE(p): ell
-A "eto.s" r_d(p): 1.724149328000026404339451
-A "eto.s" r(p): 13.79319462400021123471561
-A "eto.s" C(p): 3.448298656000062134552309 0 3.448298656000062134552309
-A "eto.s" N(p): 0 0 0.01724149328000028000285049
-A "eto.s" V(p): 8.533195938359670051909234 -11.04524849332910996224655 -1.403988582132086548881489
-A "eto.s" DB5_MINORTYPE(p): eto
-                </computeroutput>
-          </literallayout>
-          ellipse.s satisfies the search filter, but is filtered by virtue of having no differences larger than 30 in its parameters.
-        </para>
+<prompt>~:</prompt><userinput> gdiff2 -c -F "! -type comb" -t 3.0 moss.g moss2.g</userinput>
+tor was changed:
+   Parameters changed:
+      r_h: "5.079999923705999620437979" -> "8.882757536664964703732039"

-  </example>
-
-  <example><title>Three Way Differences</title>
-        <para>
-          A "3-way" diff uses an ancestor file as a basis for evaluating the differences between two
-	  other files.  This ancestor provides a "context" in which it is possible to tell whether a
-          difference between two files is a) the product of a change in one but not the other in
-          comparison to the original or b) whether both have (incompatibly) changed in comparison
-          to the original.  For example, if we compare moss2.g from the previous examples to a new
-          file moss3.g:
-          <literallayout>
-                <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 moss2.g moss3.g</userinput>
-M platform.r
-M ellipse.s
-D ellipse.r
-M light.r
-M _GLOBAL
-M cone.s
-M cone.r
-M box.s
-M tor.r
-M eto.s
-M all.g
-M tor
-A ellipse2.r
-A LIGHT
                </computeroutput>
          </literallayout>
-          All we can tell is that these objects differ from each other.  If, however, we add moss.g
-          to the comparison as an ancestor file:
-          <literallayout>
-                <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 moss2.g moss.g moss3.g</userinput>
-M platform.r
-M ellipse.s
-D(R) ellipse.r
-M light.r
-M _GLOBAL
-M cone.s
-M cone.r
-M box.s
-M tor.r
-M all.g
-D(L) LIGHT
-M tor
-A(B) tgc_new.s
-C eto.s
-A(R) ellipse2.r
-                </computeroutput>
-          </literallayout>
-          We can now see that ellipse.r was deleted only from the right file (moss3.g) and was unchanged in moss2.g.
-          Similarly, we can tell that LIGHT wsa deleted from moss2.g, ellipse2.r was added in moss3.g, tgc_new.s was
-          added identically in both moss2.g and moss3.g, and eto.s is different in moss2.g and moss3.g in some fashion
-          that the ancestor file moss.g cannot help gdiff2 resolve (a conflict, denoted by 'C'.)
-        </para>
-        <para>
-          To delve deeper into the nature of the changes, we increase the verbosity with the <option>v</option> option:
-          <literallayout>
-                <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 -v 3 moss2.g moss.g moss3.g</userinput>
-M(L) "platform.r" tree(p): - {l platform.s} {l cone.s}
-M(L) "ellipse.s" C(p): 0 1.561016355403846755933728 1.561016355403846755933728
-M(L) "ellipse.s" A(p): 5.559274328313033919357622 0 0
-D(R) ellipse.r
-M(L) "light.r" tree(p): u {l eto.s} {l cone.s}
-M(L) "_GLOBAL" title(p): Gary Moss's "World on a Platter" - diff 01
-M(L) "cone.s" H(p): 0 0 37.49945872348094155768194
-M(L) "cone.s" V(p): -23.07777996602787595747941 -46.52170066332633524552875 -19.26697361191882151842947
-M(L) "cone.r" tree(p): l cone.s {1 0 0 53.2994  0 1 0 10.1428  0 0 1 0  0 0 0 1}
-M(L) "box.s" V4(p): 29.46579237282375984818827 -5.211529731749999783119165 10.41366577147999805674772
-M(L) "box.s" V3(p): 29.46579237282375984818827 21.58122539520000060520033 10.41366577147999805674772
-M(L) "box.s" V2(p): 29.46579237282375984818827 21.58122539520000060520033 -16.37908935547000055521494
-M(L) "box.s" V1(p): 29.46579237282375984818827 -5.211529731749999783119165 -16.37908935547000055521494
-M(L) "tor.r" tree(p): l tor {1 0 0 8.44652  0 1 0 -56.3571  0 0 1 54.4836  0 0 0 2.71809}
-M(R) "all.g" tree(p): u {u {u {l platform.r} {l box.r {1 0 0 -23.6989  0 1 0 13.41  0 0 1 8.02399  0 0 0 1}}}
-{u {l cone.r {1 0 0 22.0492  0 1 0 12.2349  0 0 1 2.11125e-07  0 0 0 1}} {l ellipse2.r {1 0 0 14.6793  0 1 0
-41.6077  0 0 1 38.7988  0 0 0 1}}}} {u {l tor.r} {l light.r}}
-D(R) "all.g" region_id(p): -1
-D(L) LIGHT
-M(R) "tor" r_h(p): 6.036279429344108216071163
-M(R) "tor" r_a(p): 30.18139425891995841766402
-A(B) tgc_new.s
-C(LA!=RA) eto.s
-A(R) ellipse2.r
-                </computeroutput>
-          </literallayout>
-          At this level of verbosity, we can now see that most of the modifications are from the left (moss2.g) file.  M(L) denotes
-          a change that is present only in the left file - the right (moss3.g) agrees with the ancestor.  Similarly, we can now see
-          that the deletion of ellipse.r, the addition of ellipse2.r and the change to all.g come from moss3.g.  The conflict
-          on eto.s is that two add operations (one in moss2.g, one in moss3.g) produced different eto.s primitives - there is no
-          ancestor for eto.s in moss.g, so there is no way to identify one of the eto.s primitives as "correct" - they have equal
-          standing, and manual intervention is needed to determine which eto.s is the "correct" version.
        </para>
  </example>

-
-  <example><title>Complex Three Way Differences</title>
-        <para>
-          Conflicts can arise from situations other than incompatible additions - an incompatible modification
-          is also enough to trigger a conflict.  Consider three ellipsoids, one of which is an ancestor, one of
-          which has had its A and B vectors modified, and the other of which has had its B and C vectors modified.
-          A three-way diff of these files reports a conflict:
-          <literallayout>
-                <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 ell_1.g ell_0.g ell_2.g</userinput>
-C ell.s
-                </computeroutput>
-          </literallayout>
-
-          However, closer inspection reveals that this conflict is different than the one reported above for the eto.s object:
-          <literallayout>
-                <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 -v3 ell_1.g ell_0.g ell_2.g</userinput>
-C(LM!=RM) ell.s
-                </computeroutput>
-          </literallayout>
-          This notation indicates that a modification in the left side (ell_1.g) does not match a modification made in ell_2.g.
-          Unlike the eto.s, which reported an add conflict, this is a modification conflict triggered by incompatible, different
-          parameters.  Indeed a full verbosity inspection:
-          <literallayout>
-                <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 -v4 ell_1.g ell_0.g ell_2.g</userinput>
-M(R) "ell.s" C(p): 0 0 300
-C(A) "ell.s" B(p): 0 500 0
-C(L) "ell.s" B(p): 0 510 0
-C(R) "ell.s" B(p): 0 300 0
-M(L) "ell.s" A(p): 1100 0 0
-                </computeroutput>
-          </literallayout>
-          reveals that the changes to the A and C parameters are <emphasis>not</emphasis> in conflict - it is the B parameter that
-          is causing the problem.
-        </para>
-  </example>
-
-  <example><title>Merging Files</title>
-        <para>
-          The last and most powerful feature of <command>gdiff2</command> is to <emphasis>merge</emphasis> two or three different
-          geometry files into a single output file.  This is most useful when an ancestor is available and a three way merge can
-          be performed - in the two way case, the "ancestor" is an empty file and the results will tend to include many more
-          conflicts.  For example, the three way merge of the moss examples earlier:
-          <literallayout>
-                <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 -M moss_merged.g moss2.g moss0.g moss3.g</userinput>
-M platform.r
-M ellipse.s
-D(R) ellipse.r
-M light.r
-M _GLOBAL
-M cone.s
-M cone.r
-M box.s
-M tor.r
-M all.g
-D(L) LIGHT
-M tor
-A(B) tgc_new.s
-C eto.s
-A(R) ellipse2.r
-Merging into moss_merged.g
-<prompt>~:</prompt><userinput> mged moss_merged.g ls</userinput>
-CONFLICT(eto.s).left     cone.r/R                 platform.r/R
-CONFLICT(eto.s).right    cone.s                   platform.s
-all.g/                   ellipse.s                tgc_new.s
-box.r/R                  ellipse2.r/R             tor
-box.s                    light.r/R                tor.r/R
-                </computeroutput>
-          </literallayout>
-          The resulting file has only two conflict objects present - the same eto.s issue that was discussed earlier.  Trying to
-          do the same merge <emphasis>without</emphasis> the ancestor file:
-          <literallayout>
-                <computeroutput>
-<prompt>~:</prompt><userinput> gdiff2 -M moss_2way_merge.g moss2.g moss3.g</userinput>
-M platform.r
-M ellipse.s
-D ellipse.r
-M light.r
-M _GLOBAL
-M cone.s
-M cone.r
-M box.s
-M tor.r
-M eto.s
-M all.g
-M tor
-A ellipse2.r
-A LIGHT
-Merging into moss_2way_merge.g
-<prompt>~:</prompt><userinput> mged moss_2way_merge.g ls</userinput>
-CONFLICT(all.g).left/         CONFLICT(light.r).right/R
-CONFLICT(all.g).right/        CONFLICT(platform.r).left/R
-CONFLICT(box.s).left          CONFLICT(platform.r).right/R
-CONFLICT(box.s).right         CONFLICT(tor).left
-CONFLICT(cone.r).left/R       CONFLICT(tor).right
-CONFLICT(cone.r).right/R      CONFLICT(tor.r).left/R
-CONFLICT(cone.s).left         CONFLICT(tor.r).right/R
-CONFLICT(cone.s).right        LIGHT
-CONFLICT(ellipse.s).left      box.r/R
-CONFLICT(ellipse.s).right     ellipse.r/R
-CONFLICT(eto.s).left          ellipse2.r/R
-CONFLICT(eto.s).right         platform.s
-CONFLICT(light.r).left/R      tgc_new.s
-                </computeroutput>
-          </literallayout>
-          The result is far less clean, although the merge was still performed - in this latter case, the end user will have to
-          resolve many more conflicting object states manually.
-        </para>
-  </example>
-
-
-
 	</refsect1>

 	<refsect1 xml:id='see_also'><title>SEE ALSO</title>
@@ -24,7 +24,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>gencolor</command>
+<para><emphasis remap='I'>Gencolor</emphasis>
 repeats a pattern of up to 8192 8-bit values on its standard output.
 The values, which range from 0 to 255, are taken either from the command
 line, or in binary from its standard input.  The
@@ -38,8 +38,9 @@ will refuse to write its output to a window; you must redirect the output to a f
 </refsect1>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<para>gencolor -r512 0 255 0 &gt; foo.pix</para>
-<para>Will output 512 "green" pixels.</para>
+<para><userinput>gencolor -r512 0 255 0 &gt; foo.pix</userinput>
+<!-- .br -->
+Will output 512 "green" pixels</para>
 </refsect1>

 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
@@ -119,7 +119,7 @@ can achieve animation effects.</para>
 <refsection xml:id="example"><title>EXAMPLE</title>
 <para>The following is a typical invocation:</para>
 <literallayout remap="RS" class="normal">
-gif-fb image.gif
+<option>gif-fb</option> image.gif
 </literallayout> <!-- remap='RE' -->
 </refsection>

@@ -30,7 +30,7 @@


 <refsect1 xml:id='description'><title>DESCRIPTION</title>
-<para><command>iges-g</command>
+<para><emphasis remap='I'>iges-g</emphasis>
 converts the specified
 <emphasis remap='I'>file.iges</emphasis>
 to a BRL-CAD
@@ -88,19 +88,19 @@ and are therefore approximated. The solid of revolution is built from a series o
 truncated right cones developed by approximating the curve to be revolved with a series
 of straight line segments. The extrusion is similarly handled by approximating the
 curve to be extruded with straight line segments and using that to build a BRL-CAD
-<emphasis remap='I'>polysolid</emphasis>.
+<emphasis remap='I'>polysolid.</emphasis>
 Planar faced IGES BREP objects are converted to BRL-CAD NMG structures.</para>
 </refsect1>

 <refsect1 xml:id='example'><title>EXAMPLE</title>
 <synopsis>
-$ iges-g -o <emphasis remap='I'>-o sample.g sample.iges</emphasis>
+$ <emphasis remap='I'>iges-g -o sample.g sample.iges</emphasis>
 </synopsis>
 </refsect1>

 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
-<para><emphasis remap='I'>The Initial Graphics Exchange Specification (IGES) Version 5.1</emphasis>,
-IGES/PDES Organization, September 1991</para>
+<para><emphasis remap='I'>The Initial Graphics Exchange Specification (IGES) Version 5.1,</emphasis>
+IGES/PDES Organization, September 1991.</para>
 </refsect1>

 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
@@ -108,11 +108,11 @@ IGES/PDES Organization, September 1991</para>
 </refsect1>

 <refsect1 xml:id='authors'><title>AUTHORS</title>
-<para>John Anderson;
+<para>John Anderson
 <!-- .br -->
-Susanne Muuss;
+Susanne Muuss
 <!-- .br -->
-Phil Dykstra;
+Phil Dykstra
 <!-- .br -->
 Earl Weaver</para>

--- a/Show More
+++ b/Show More