Nevermind, after discussion with Sean the idea is to baseline on C89 and then move forward, not continually maintain support for various standards. (svn branch delete)

svn:revision:58033 svn:branch:compiler-flags svn:account:starseeker
Start working on a generalized mechanism for selecting and reporting C and C++ standards for compilation
2013-10-01 16:15:58 +00:00 · 2013-10-01 15:48:53 +00:00 · 2013-10-01 14:41:54 +00:00
10126 changed files with 961884 additions and 1216870 deletions
@@ -0,0 +1,2 @@
+/bin
+/lib
@@ -218,23 +218,6 @@ nicknames r_weiss
 2008 December
 U.S. Army Research Laboratory

-Browder, Thomas M. Jr.  **
-nicknames tbrowder2
-2008 June
-ManTech International Corporation
-Open Source
-
-Reed, Nicholas  **
-nicknames n_reed
-2008 July
-ARL Student Hire / University of Maryland, Baltimore County
-Quantum Research International, Inc.
-
-Moore, Jr., Carl G.  **
-nicknames cmoore, carlmoore
-2011 October
-U.S. Army Research Laboratory
-

 MATHEMATICAL, ALGORITHMIC, AND GEOMETRIC SUPPORT
 ------------------------------------------------
@@ -246,7 +229,7 @@ U.S. Army Ballistic Research Laboratory
 Davisson, Edwin O. **
 U.S. Army Research Laboratory

-Rogers, David
+Rodgers, David
 U.S. Naval Academy

 Stiller, Peter
@@ -515,6 +498,17 @@ nicknames homovulgaris, madant
 2008 June
 Open Source (GSoC)

+Browder, Thomas M. Jr.
+nicknames tbrowder2
+2008 June
+ManTech International Corporation
+Open Source
+
+Reed, Nicholas
+nicknames n_reed
+2008 July
+ARL Student Hire / University of Maryland, Baltimore County
+
 Saunders, Benjamin
 nicknames Ralith
 2008 July
@@ -566,6 +560,11 @@ nicknames abhi2011
 2011 July
 Open Source (SOCIS)

+Moore, Jr., Carl G.
+nicknames cmoore, carlmoore
+2011 October
+U.S. Army Research Laboratory
+
 Silvko, Ksenija
 nicknames ksuzee
 2012 March
@@ -652,7 +651,6 @@ Calle, Adrián Arroyo
 Open Source (GCI)

 Keesing, Aaron
-nicknames agkphysics
 2012 December
 Open Source (GCI)

@@ -665,11 +663,6 @@ nicknames ncsaba
 2013 April
 Open Source

-Check, Nyah
-nicknames Ch3ck
-2013 July
-Open Source (GSoC)
-
 Shah, Kesha
 nicknames keshashah
 2013 April
@@ -690,72 +683,15 @@ nicknames zero_level
 2013 June
 Open Source (GSoC)

-Kamga, Isaac
-nicknames Izak
-2013 July
-Open Source (GSoC)
-
-Singh, Harmanpreet
-nicknames harmanpreet
-2013 May
-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
-Open Source (GCI)
-
-Schulte, Johannes
-2013 November
-Open Source (GCI)
-
-Amidon, Peter
-2013 November
-Open Source (GCI)
-
-Chiplunkar, Shardul
-nicknames microchip
-2013 November
-Open Source (GCI)
-
-Берегов, Станислав
-2013 December
-Open Source (GCI)
-
-nicknames huskmate13
-2014 January
-Open Source
-
-Gustave Granroth
-2014 May
-Open Source
-
-Jain, Rishub
-2014 July
-ARL Student Hire
-
-Roberts, Mitchell
-2014 July
-ARL Student Hire
-
-Bayes, Matthew
-nicknames klinger4077
-2014 July
-ARL Student Hire / University of Maryland College Park
-
-Mirea, Ștefan-Gabriel
-2014 October
-Open Source


 SPECIAL THANKS
@@ -1030,24 +966,6 @@ nicknames talwindersaini
 2013 July
 Open Source

-YuGin, Tan
-2013 November
-Open Source (GCI)
-
-nicknames mandar
-2013 December
-Open Source (GCI)
-
-Lotsu, Alexander
-nicknames Alex
-2013 December
-Open Source (GCI)
-
-Hyams, Daniel
-nicknames dhyams
-2014 February
-Open Source
-

 CORPORATE AND ORGANIZATION SUPPORT
 ----------------------------------
@@ -15,42 +15,6 @@ on-going issues.
 Recent Bugs
 -----------

-* report that attempting to change units on a read-only file in MGED
-  will not change the units in the file but changes them in MGED,
-  resulting in problems with nirt missing geometry it shouldn't miss.
-
-* typing 'comb -f -r assembly_name' shuts down mged with the error:
-  ERROR: bad pointer 0000000000B4CA50: s/b bu_external(x768dbbd0), was bu_vls(x89333bbb), file ..\..\..\brlcad_src\src\libbu\parse.c, line 2443"
-  And on the mged command line:
-  rt_db_cvt_to_external5 expecting non-NULL name parameter
-  wdb_export((null)): solid export failure
-
-* running "draw -C 0/255/0" in archer dies with a bu_malloc(0) error.
-
-* iges exporter is writing out corrupted output due to spaces after
-  commas.
-
-* report of mged command history not working with the down arrow key
-  in 7.25.0 (on Windows, unknown on other platforms).  Up arrow works
-  fine.
-
-* wgl framebuffer is not lingering on windows (regardless of using
-  wgll or default) when it should
-
-* 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
-  TIE when the environment variable is set.
-
-* nirt -e "xyz val val val" doesn't work due to the space after the -e
-  and how the nirt/rt commands parse quoted args.
-
-* probably related, there is a big parsing difference between nirt
-  with "xyz 1.0 2.0 3.0; dir 0 -1 0;" and "xyz 1. 2. 3. ; dir 0 -1
-  0;".  note the intentional space.  problem observed is that center
-  point ended up being "0.0 2.0 0.0" with there clearly being a
-  parsing error depending on where the semicolon was positioned.
-
 * calling "attr set obj key value" should always result in key getting
  set to value, no matter what, as it is the lowest-level attribute
  management interface and what the command (correctly) documents.
@@ -305,6 +269,9 @@ Recent Bugs
  bogus lists visible with nirt in mged, entirely missing the bot, or
  mismatched entry/exit/overlap segments.

+* nirt -e "xyz val val val" doesn't work due to the space after the -e
+  and how the nirt/rt commands parse quoted args.
+
 * tab completion in classic/command mode sometimes doesn't work
  (presumably if mged can't find tcl resources).  was finally able to
  reproduce this with the result given as:
@@ -547,12 +514,6 @@ Recent Bugs
  line (infinite loop).  also gives infinite areas when presented with
  an empty .density file.

-* rtarea gives incorrect areas when using -H hypersample flag
-
-* rtweight/gqa volumes seem wrong with simple sphere test case, with
-  values consistently and quickly converging less than the actual
-  volume regardless of the grid size.
-
 * setting src/librt/db5_io.c's AVS_ADD off in db5_import_attributes
  causes bad things to happen and it really shouldn't.

@@ -8,7 +8,7 @@ include developer application programming interface (API) calls as
 well as user application command-line interface (CLI) and graphical
 user interface (GUI) behaviors.  Changes are characterized as:

-    1) those affecting a new interface,
+    1) changing a new interface,
    2) being minimally impacting, or
    3) requiring adherence to deprecation policy.

@@ -23,11 +23,10 @@ NEW INTERFACE
 -------------

 Changes to interfaces that have been recently introduced are often
-subject to further change and should not yet be relied upon by
-application developers or users until they stabilize.  They are
-allowed to change from release to release and are not subject to
-change policy restrictions until they have been included in at least
-TWO releases without any change.
+subject to change and should not yet be relied upon by application
+developers or users.  They may be changed as needed from release to
+release and are not subject to change policy restrictions until they
+have been included in at least TWO releases without change.


 MINIMALLY IMPACTING
@@ -36,21 +35,20 @@ MINIMALLY IMPACTING
 If a change to an interface has a suitable and completely equivalent
 alternative, the change is deemed to be "minimally impacting" and can
 be made during any release.  Examples of such changes include renaming
-an interface, reordering parameters, adding optional parameters,
-adding additional parameters for previously implicit behavior, and
-removing unused parameters.
+an interface, reordering parameters, adding additional parameters for
+previously implicit behavior, and removing unused parameters.

-Generally, the impact can usually be considered minimally impacting if
+Basically, the impact can usually be considered minimally impacting if
 a static regular expression search-and-replace is all that is needed
-to update calling code, and no manual intervention is required.
+to update calling code, and no change is imposed on the user.


 DEPRECATION POLICY
 ------------------

-If a change will intentionally alter, replace, or remove functionality
-that has been documented and published in at least TWO releases, it
-should mut first be announced as DEPRECATED.  Otherwise, changes to
+If a change will intentionally change, replace, or remove
+functionality that has been documented and published in at least TWO
+releases should be first marked as DEPRECATED.  Otherwise, changes to
 interfaces that have not been publicly announced or are not publicly
 documented for at least two releases may be changed without notice.

@@ -115,27 +113,8 @@ change involved a removal of a command or function, both the original
 and new names should be listed for reference.


-7.26
----
-include/bn.h
-	bn_tcl_mat_print, removal of all tcl-specific API functions [deprecated 7.26]
-include/raytrace.h
-	curve_to_tcl_list rt_tcl_parse_ray rt_tcl_pr_cutter
-	rt_tcl_pr_hit rt_tcl_rt rt_tcl_import_from_path
-	db_full_path_appendresult tcl_obj_to_int_array
-	tcl_obj_to_fastf_array tcl_list_to_int_array
-	tcl_list_to_fastf_array *_tcl_*, removal of all tcl-specific
-	API functions [deprecated 7.26]
-
-pixcut, pixpaste
-        copyright cleanup [deprecated 7.26]
-librt, fast4-g
-	removal of CLINE entity support [deprecated 7.26]
-
 7.24
 ----
-fbed, pp-fb
-        removes termcap use, no known users [deprecated 7.24]
 include/raytrace librt
        db_full_path_list_add(), db_free_full_path_list() [deprecated 7.24]
        db_search_formplan(), db_search_freeplan(), db_search_full_paths() [deprecated 7.24]
@@ -143,7 +122,7 @@ include/raytrace librt
 src/irprep
        all_sf, firpass, ir-X, irdisp, pictx, secpass, shapefact, showterm [deprecated 7.24]
 include/raytrace.h librt
-        RT_DBHASH and RT_DBNHASH [deprecated 7.24]
+        RT_DBHASH and RT_DBNHASH [deprecation 7.24]

 7.22
 ----
@@ -160,6 +139,9 @@ mged

 7.20
 ----
+liborle
+	remove liborle and the tools using it, fb-orle, orle-fb, orle-pix and
+	pix-orle [deprecated 7.20]
 tclscripts/lib
 	Mged, Database, Db, Dm, Drawable, Display, QuadDisplay, View -> Ged [deprecated 7.20]
 librt
@@ -168,7 +150,8 @@ librt
 	hf primitive [deprecated 7.20]
 include/bu.h
 	bu_vls_init_if_uninit() -> bu_vls_init() [deprecated 7.20]
-GNU Autotools configure compatibility script
+autogen.sh && configure
+	GNU Autotools build system -> CMake build system [deprecated 7.20]
 	./configure -> cmake . [deprecated 7.20]
 include/raytrace.h
 	rt_load_attrs() -> rt_gettrees_and_attrs() or db5_import_attributs() [deprecated 7.20]
@@ -233,6 +216,12 @@ mged
 ----
 struct bu_structparse 'i' format
       'i' -> '%p' [deprecated 7.16]
+SGI-specific tools
+	pl-sgi -> pl-fb [ deprecated 7.16 ]
+Dunn camera and Canon printer tools
+	dunncolor [ deprecated 7.16 ]
+	dunnsnap [ deprecated 7.16 ]
+	canonize [ deprecated 7.16 ]
 reserved attributes and case-sensitivity
 	id -> region_id [deprecated 7.16]
 	GIFTmater -> material_id [deprecated 7.16]
@@ -241,21 +230,63 @@ reserved attributes and case-sensitivity
 	AIRCODE -> air [deprecated 7.16]
 	rgb -> color [deprecated 7.16]
 	oshader -> shader [deprecated 7.16]
+genptr_t/GENPTR_NULL
+	genptr_t -> void* [deprecated 7.16]
+any-png.sh
+	use pix tools [deprecated 7.16]
+cadbug.sh
+	use sf.net tracker [deprecated 7.16]
+cray.sh
+	obsolete hardware [deprecated 7.16]
+pixwrite.sh
+	obsolete hardware [deprecated 7.16]
+pixread.sh
+	obsolete hardware [deprecated 7.16]
+sgisnap.sh
+	obsolete hardware [deprecated 7.16]
+include/bu.h
+	bu_argv0() -> bu_basename(bu_argv0_full_path()); [deprecated 7.16]
 include/raytrace.h
 	rt_prep_timer() -> bu_timer() [deprecated 7.16]
 	rt_get_timer() -> bu_elapsed() [deprecated 7.16]
+mged
+	make_bb -> bb [deprecated 7.16]

 7.14
 ----
+include/dm_color.h
+	dm_color.h -> dm.h [deprecated 7.14]
+include/fb.h
+	FB_WPIXEL -> fb_wpixel [deprecated 7.14]
+src/gtools
+	g_[toolname] -> g[toolname] [deprecated 7.14]
+include/raytrace.h
+	rt_fdiff -> NEAR_ZERO [deprecated 7.14]
+	rt_reldiff -> NEAR_ZERO [deprecated 7.14]
+	DIR_* -> RT_DIR_* [deprecated 7.14]
 mged
-	src/tclscripts/mged/bots.tcl [deprecated 7.14]
+	tops -g -u -> now default behavior [deprecated 7.14]
+	-n option -> -c option [deprecated 7.14]
+	bots, per_line [deprecated 7.14]
+include/vmath.h
+	VADD2_2D -> V2ADD2 [deprecated 7.14]
+	VSUB2_2D -> V2SUB2 [deprecated 7.14]
+	MAGSQ_2D -> MAG2SQ [deprecated 7.14]
+	VDOT_2D -> V2DOT [deprecated 7.14]
+	VMOVE_2D -> V2MOVE [deprecated 7.14]
+	VSCALE_2D -> V2SCALE [deprecated 7.14]
+	VJOIN1_2D -> V2JOIN1 [deprecated 7.14]

 7.12
 ----
 include/raytrace.h
 	rt_functab size -> growing ft_label and new callbacks [deprecated 7.12]
+srt/librt/cmd.c
+	rt_split_cmd() -> bu_argv_from_string() [deprecated 7.12]
 src/rt/viewarea.c
 	terminology and output format [deprecated 7.12]
+include/raytrace.h
+	RT_HIT_NORM -> RT_HIT_NORMAL [deprecated 7.12]

 pre 7.0
 -------
@@ -271,64 +302,6 @@ include/raytrace.h
 Below are the interfaces that have followed deprecation policy and are
 now no longer a part of BRL-CAD.

-7.26.0
------
-include/dg.h
-        implementation detail no longer being exposed, use libged [deprecated 7.22]
-autogen.sh && configure
-	GNU Autotools build system -> CMake build system [deprecated 7.20]
-Dunn camera and Canon printer tools
-	dunncolor [ deprecated 7.16 ]
-	dunnsnap [ deprecated 7.16 ]
-	canonize [ deprecated 7.16 ]
-genptr_t/GENPTR_NULL
-	genptr_t -> void* [deprecated 7.16]
-include/bu.h
-	bu_argv0() -> bu_basename(bu_argv0_full_path()); [deprecated 7.16]
-include/dm_color.h
-	dm_color.h -> dm.h [deprecated 7.14]
-include/fb.h
-	FB_WPIXEL -> fb_wpixel [deprecated 7.14]
-include/raytrace.h
-	rt_fdiff -> NEAR_ZERO [deprecated 7.14]
-	rt_reldiff -> NEAR_ZERO [deprecated 7.14]
-	DIR_* -> RT_DIR_* [deprecated 7.14]
-	RT_HIT_NORM -> RT_HIT_NORMAL [deprecated 7.12]
-include/vmath.h
-	VADD2_2D -> V2ADD2 [deprecated 7.14]
-	VSUB2_2D -> V2SUB2 [deprecated 7.14]
-	MAGSQ_2D -> MAG2SQ [deprecated 7.14]
-	VDOT_2D -> V2DOT [deprecated 7.14]
-	VMOVE_2D -> V2MOVE [deprecated 7.14]
-	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
-	make_bb -> bb [deprecated 7.16]
-	tops -g -u -> now default behavior [deprecated 7.14]
-	-n option -> -c option [deprecated 7.14]
-	per_line [deprecated 7.14]
-SGI-specific tools
-	pl-sgi -> pl-fb [ deprecated 7.16 ]
-src/gtools
-	g_[toolname] -> g[toolname] [deprecated 7.14]
-src/librt/cmd.c
-	rt_split_cmd() -> bu_argv_from_string() [deprecated 7.12]
-any-png.sh
-	use pix tools [deprecated 7.16]
-cadbug.sh
-	use sf.net tracker [deprecated 7.16]
-cray.sh
-	obsolete hardware [deprecated 7.16]
-pixwrite.sh
-	obsolete hardware [deprecated 7.16]
-pixread.sh
-	obsolete hardware [deprecated 7.16]
-sgisnap.sh
-	obsolete hardware [deprecated 7.16]

 7.24.2
 ------
@@ -964,9 +937,9 @@ s/bu_strcmpm\((.*),([^,]*)\)/bu_strcmp(\1)/g

 7.24
 ----
-s/bu_set_realtime\([[:space:]]\);//g
+s/bu_set_realtime([[:space:]]);//g
        didn't do anything [7.23]
-s/.*bu_cpulimit_[sg]et\([[:space:]]\);//g
+s/.*bu_cpulimit_[sg]et([[:space:]]);//g
        didn't do anything [7.23]
 s/rt_g\./RTG\./g
        renamed rt_g global to RTG so it doesn't match the struct name [7.24]
@@ -977,51 +950,3 @@ s/redraw_vlist/draw/g
 s/RT_BADNUM/INVALID/g
 s/RT_BADVAL/VINVALID/g
        moved RT_BADNUM and RT_BADVEC to vmath.h as INVALID and VINVALID [7.24]
-s/bu_create_hash_tbl/bu_hash_tbl_create/g
-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/bu_vls_trunc2/bu_vls_trunc/g
-        removed duplicitous function in favor of more general version [7.24]
-s/bn_pi/M_PI/g
-s/bn_twopi/M_2PI/g
-s/bn_halfpi/M_PI_2/g
-s/bn_quarterpi/M_PI_4/g
-s/bn_invpi/M_1_PI/g
-s/bn_inv2pi/M_1_2PI/g
-s/bn_inv4pi/M_1_4PI)/g
-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]
-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:]]+["<])hist\.h/\1bu\/hist.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]
-
-7.26
----
-s/bu_kill_parallel\([[:space:]]*\);//g
-        didn't do anything unless called from forked process, use bu_terminate() [7.25]
-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.25]
-s/bu_semaphore_reinit/bu_semaphore_init/g
-        no longer need to manually reinitialize (or initialize) semaphores [7.25]
-s/(#[[:space:]]*include[[:space:]]+["<])fbio\.h/\1bu\/fb.h/g
-        fbio.h is now part of fb.h [7.25]
-s/UNION/'u'/g
-s/SUBTRACT/'-'/g
-s/INTERSECT/'+'/g
-        old db.h db4 preprocessor symbols removed, use char or DB_OP_* [7.25]
-s/(#[[:space:]]*include[[:space:]]+["<])bselect\.h/\1bsocket.h/g
-s/(#[[:space:]]*include[[:space:]]+["<])bin\.h/\1bnetwork.h/g
-        rename bselect.h and bin.h public headers to be more declaratively named [7.25]
-
@@ -101,7 +101,7 @@ arranged.  This includes an implicit assignment of copyright for any
 and all contributions being made.  The following notice should be
 prominent in the BRL-CAD sources:

-  Copyright (c) 1984-2014 United States Government as represented by
+  Copyright (c) 1984-2013 United States Government as represented by
  the U.S. Army Research Laboratory.

 Contact
@@ -559,12 +559,12 @@ bn.h, part of libbn).  Examples:

  For known tolerances:

-  * instead of "foo == 2.0" use "NEAR_EQUAL(foo, 2.0, tol)"
-  * instead of "foo != 0.0" use "foo !NEAR_ZERO(foo, tol)"
+  * instead of "foo == 2.0" use "NEAR_EQUAL(foo,2.0,tol)"
+  * instead of "foo != 0.0" use "foo !NEAR_ZERO(foo,tol)"

  For indeterminate tolerances:

-  * instead of "foo == 2.0" use "EQUAL(foo, 2.0)"
+  * instead of "foo == 2.0" use "EQUAL(foo,2.0)"
  * instead of "foo != 0.0" use "foo !ZERO(foo)"

 There are several functions whose functionality are either wrapped or
@@ -594,7 +594,6 @@ variables should be utilized instead of the standard C facility:
  bu_strncmp() instead of strncmp()
  bu_strcasecmp() instead of strnicmp()/strncasecmp()
  bu_file_delete() instead of unlink(), rmdir(), and remove()
-  bu_sort() instead of qsort()

 Similarly, ANSI C functions are preferred over the BSD and POSIX
 interfaces.  The following functions should be used:
@@ -649,7 +648,7 @@ main(int ac, char *av[])
 ....int i;
 ....int foo = 0;

-....for (i = 0 ; i < 10; i++) {
+....for (i=0; i<10; i++) {
 [      ]foo += 1;
 [      ]if (foo % 2) {
 [      ]....printf("hello\n");
@@ -677,12 +676,6 @@ Commas and semicolons are followed by whitespace.
  int main(int argc, char *argv[]); /* ok */
  for (i = 0; i < max; i++) { ...   /* ok */

-Operators and arguments generally are separated with whitespace.
-  if (FLAG & MORE_FLAGS) { ...      /* ok */
-  for (i = 0; i < max; i++) { ...   /* ok */
-  if (FLAG&MORE_FLAGS) { ...        /* discouraged */
-  for (i=0; i<max; i++) { ...       /* discouraged */
-
 No space on arrow operators.
  structure->member = 5;            /* ok */
  structure -> member = 5;          /* bad */
@@ -713,8 +706,7 @@ braces should line up with that same statement.  Functions, however,
 are treated specially and we place their opening braces on separate
 lines.  See http://en.wikipedia.org/wiki/Indent_style for details.

-  int
-  some_function(char *j)
+  int some_function(char *j)
  {
      for (i = 0; i < 100; i++) {
 	  if (i % 10 == 0) {
@@ -759,20 +751,6 @@ other familiar programming construct (e.g., bu_malloc()+bu_free()),
 but care should otherwise be taken to be as consistent as possible
 within a file and across a library's API.

-Here are some naming convention pairings commonly used:
-
-  Allocation   => alloc()
-  Deallocation => free()
-
-  Initialization      => init()
-  De/Reinitialization => clear()
-
-  Allocation + Init      => create()   (new for C++)
-  Deinitialize + Dealloc => destroy()  (delete for C++)
-
-  Resource acquire => open()
-  Resource release => close()
-
 5) Debugging

 Compilation preprocessor defines should never change the size of
@@ -960,32 +938,36 @@ BUGS & UNEXPECTED BEHAVIOR
 --------------------------

 When a bug or unexpected behavior is encountered that cannot be
-quickly fixed, it needs to be documented in our BUGS file or more
-formally reported to the SourceForge bug tracker at:
+quickly fixed, it minimally needs to be documented.  If you are
+already a BRL-CAD contributor, this means either making a comment in
+the BUGS file or by making a formal report to the SourceForge bug
+tracker at:

 http://sourceforge.net/tracker/?atid=640802&group_id=105292&func=browse

-The tracker is the main source for user-reported bugs and/or any
-issues that require significant discussion or benefit from having
-their status publicly announced.  Issues listed in BUGS file are not
-necessarily listed in the tracker, and vice-versa.  The BUGS file is
-also a convenience notepad of long and short term development issues.
+If the bug is complicated, will require significant discussion or
+collaboration, cannot be fixed any time soon, or if you do not have
+commit access, the issue should be reported to the SourceForge bug
+tracker.  The issues listed in BUGS are not necessarily listed in bug
+tracker, and vice-versa.  The BUGS file is merely maintained as a
+convenience notepad of long and short term issues for the developers
+only.


 COMMIT ACCESS
 -------------

 Commit access is evaluated on a person-to-person basis at the
-discretion of existing contributors.  Commit access is generally
-granted after a contributor demonstrates strong competency with our
-developer guidelines and an existing developer with commit access
-vouches for the new developer.
+discretion of existing contributors, but generally readily granted so
+long as there is an existing developer with commit access willing to
+mentor the new developer.  If you would like to have commit access,
+there is usually no need to ask -- they will ask you.  Getting
+involved with the other contributors and making patches will generally
+result in automatic consideration for commit access.  If you have to
+ask for it, you probably won't get it.

-If you would like to have commit access, there is no need to ask.
-Getting involved with the other contributors and making patches will
-result in automatic consideration for commit access.  That said, the
-following steps represent a minimum that needs to occur in order for
-commit access to be granted:
+That said, the following steps represent a minimum that needs to occur
+in order for commit access to be granted:

 1) Read this file completely.

@@ -993,19 +975,25 @@ commit access to be granted:

 3) Join the brlcad-devel developer mailing list, introduce yourself.

-4) Create a SourceForge account, submit at least two patches that
+4) Create a SourceForge account, submit two or more patches that
 demonstrate competency with our coding style, apply flawlessly, and
-provide some signficant improvement.
+provide significant improvements to the existing code.

-5) Get to know the other developers.  One of them will need to vouch
-for your commit access.
-
-*) Be a nice person.  ;)
+5) Be a nice person.  We're here to have fun and do cool things.  ;)

 Those with commit access have a responsibility to ensure that other
 developers are following the guidelines that have been described in
 this developer's guide within reasonable expectations.  A basic rule
-of thumb is:  don't break anything.
+of thumb is: don't break anything.
+
+While the testing process will strive to ensure consistent behavior as
+changes are made, the responsibility still remains with the individual
+contributors to ensure that everything still compiles and runs as it
+should.  At any given time, BRL-CAD should compile on all of the
+primary platforms and (minimally) pass the BRL-CAD Benchmark
+successfully.  If changes are made that are not exercised by the
+Benchmark suite, testing should be manually performed in a manner that
+exercises those particular changes.


 CONTRIBUTOR RESPONSIBILITIES
@@ -1081,8 +1069,7 @@ number follows a common convention where the three numbers represent:
    {MAJOR_VERSION}.{MINOR_VERSION}.{PATCH_VERSION}

 All "development" builds use an odd number for the minor version.  All
-"release" builds use an even number for the minor version.  Patched
-versions should include a release count:
+"release" builds use an even number for the minor version.  Patched versions should include a release count:

    {MAJOR_VERSION}.{MINOR_VERSION}.{PATCH_VERSION}[-{RELEASE_COUNT}]

@@ -1310,7 +1297,7 @@ Release steps are as follows:
    # NON-AUTO: NEWS
    # NON-AUTO: README
    # NON-AUTO: include/conf/PATCH
-    # NON-AUTO: include/conf/MINOR (See VERSION NUMBERS & COMPATIBILITY section.)
+    # NON-AUTO: include/conv/MINOR (See VERSION NUMBERS & COMPATIBILITY section.)
    # NON-AUTO: misc/debian/changelog
    # NON-AUTO: misc/macosx/Resources/ReadMe.rtfd/TXT.rtf
    # NON-AUTO: misc/macosx/Resources/Welcome.rtfd/TXT.rtf
@@ -1320,7 +1307,6 @@ Release steps are as follows:

    LAST=`grep -E "\--- [0-9]{4}-[0-9]{2}-[0-9]{2}" NEWS | head -n 2 | tail -n 1 | awk '{print $2}'`
    echo "LAST=$LAST"
-    LAST=r57446
    svn2cl --break-before-msg --include-rev --stdout -r HEAD:{$LAST} > ChangeLog
    svn commit -m "update log with commits through $LAST" ChangeLog

@@ -1441,7 +1427,7 @@ Release steps are as follows:
 	http://t2-project.org/packages/brlcad.html

    OpenSUSE package maintainer
-        https://build.opensuse.org/package/users/Education/brlcad
+	https://build.opensuse.org/package/users?package=brlcad&project=Education

    FreeBSD ports maintainer
 	http://www.freebsd.org/cgi/cvsweb.cgi/ports/cad/brlcad/
@@ -1521,6 +1507,10 @@ Mac OS X release:

 Multiple platform major release and announcements:

+    upFront.ezine, Ralph Grabowski
+	ralphg@upfrontezine.com
+	with news details
+
    CADinfo.NET
 	copyboy@cadinfo.net
 	with news details
@@ -405,51 +405,62 @@ mode.
 Aliases:  ENABLE_STRICT, ENABLE_STRICT_COMPILE, ENABLE_STRICT_COMPILE_FLAGS


--- ENABLE_ALL_CXX_COMPILE ---
-
-Build all C and C++ files with a C++ compiler.  Defaults to OFF.
-
-EXPERIMENTAL!
-
-Aliases:  ENABLE_ALL_CXX
-
-
 --- ENABLE_POSIX_COMPLIANCE ---

 Build with strict POSIX compliance checking.  Defaults to OFF.

 Causes compiler options to be set for strict compliance with the
 minimum C and C++ standards acceptable according to current BRL-CAD
-policy.  The current minimum C standard is ??.
+policy.  The current minimum C standard is POSIX 200112 plus C99.
 There is no currently defined minimum C++ standard.

 Aliases:  ENABLE_POSIX


--- ENABLE_STRICT_COMPILER_STANDARD_COMPLIANCE ---
+--- ENABLE_C99_COMPLIANCE ---

-Build with strict ISO C compliance checking.  Defaults to OFF.
+Build with strict C99 compliance checking.  Defaults to OFF.

-Causes C compiler options to be set for strict compliance with the
-appropriate ISO C standard.
+Causes C compiler options to be set for strict compliance with the C99
+standard.

-Aliases:  STRICT_ISO_C
+Aliases:  ENABLE_C99


 --- BRLCAD_EXTRADOCS ---

-The core option that enables and disables building of BRL-CAD's
-DocBook based documentation (includes manuals and man pages for
-commands, among other things).  Defaults to ON, but only HTML and MAN
-formats are enabled by default - PDF must be enabled separately by use
-of this option or one of its aliases.  Note that you may set
-environment variable APACHE_FOP to point to your locally installed fop
-executable file (which on Linux is usually a shell script with 0755
-permissions).
+The core option that enables and disables building of BRL-CAD's DocBook
+based documentation (includes manuals and man pages for commands, among
+other things.)  Defaults to ON, but only HTML and MAN formats are enabled
+by default - PDF must be enabled separately by use of this option or one
+of its aliases.  Note that you may set environment variable APACHE_FOP
+to point to your locally installed fop executable file (which on Linux is
+usually a shell script with 0755 permissions).

 Aliases:  ENABLE_DOCS, ENABLE_EXTRA_DOCS, ENABLE_DOCBOOK


+--- BRLCAD_REGEX ---
+
+Option for enabling and disabling compilation of the Regular
+Expression Library provided with BRL-CAD's source distribution.
+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_REGEX
+
+
+--- BRLCAD_ZLIB ---
+
+Option for enabling and disabling compilation of the zlib library
+provided with BRL-CAD's source distribution.  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_ZLIB, ENABLE_LIBZ
+
+
 --- BRLCAD_LEMON ---

 Option for enabling and disabling compilation of the lemon parser
@@ -481,17 +492,6 @@ AUTO.  perplex requires a working re2c.
 Aliases:  ENABLE_PERPLEX


--- BRLCAD_ASTYLE ---
-
-Option for enabling and disabling compilation of the Artistic Style
-(astyle) utility provided with BRL-CAD's source distribution.  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_ASTYLE
-
-
 --- BRLCAD_XSLTPROC ---

 Option for enabling and disabling compilation of the xsltproc XML
@@ -515,37 +515,6 @@ version if BRLCAD_BUNDLED_LIBS is also AUTO.
 Aliases:  ENABLE_XMLLINT


--- BRLCAD_REGEX ---
-
-Option for enabling and disabling compilation of the Regular
-Expression Library provided with BRL-CAD's source distribution.
-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_REGEX
-
-
--- BRLCAD_ZLIB ---
-
-Option for enabling and disabling compilation of the zlib library
-provided with BRL-CAD's source distribution.  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_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
@@ -692,7 +661,7 @@ version if BRLCAD_BUNDLED_LIBS is also AUTO.
 Aliases:  ENABLE_OPENNURBS


--- BRLCAD_SC ---
+--- BRLCAD_SCL ---

 Option for enabling and disabling compilation of the NIST Step Class
 Libraries provided with BRL-CAD's source code.  Default is AUTO,
@@ -702,7 +671,7 @@ first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
 Aliases:  ENABLE_SCL, ENABLE_STEP, ENABLE_STEP_CLASS_LIBRARIES


--- BRLCAD_VDS ---
+--- BRLCAD_LIBVDS ---

 Option for enabling and disabling compilation of the libvds triangle
 simplification library provided with BRL-CAD's source code.  Default
@@ -713,17 +682,7 @@ 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 ---
+--- BRLCAD_LIBGDIAM ---

 Option for enabling and disabling compilation of the libgdiam approximate
 tight bounding box library provided with BRL-CAD's source code.  Default
@@ -734,17 +693,6 @@ AUTO.
 Aliases:  ENABLE_GDIAM


--- BRLCAD_BULLET ---
-
-Option for enabling and disabling compilation of the Bullet Realtime
-Physics Simulation Libraries provided with BRL-CAD's source
-distribution.  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_BULLET
-
-

 *** Note - Do not add or edit configuration option descriptions and alias
   lists in this file - those entries are auto-generated from information in
@@ -9,94 +9,28 @@ first and are grouped by release.  Each release also includes optional
 descriptive text that emphasizes or further describes significant
 changes made.  See document footer for additional details.

-
 ----------------------------------------------------------------------
--- 2014-XX-XX  Release 7.26.XX                                    ---
+--- 2013-0X-XX  Release 7.24.2                                     ---
 ----------------------------------------------------------------------

-* fixed texture mapping crash with bad image dimensions - Ștefan Mirea
-* fixed g2asc and asc2g handling of dsp primitive - Cliff Yapp
-* rewrote gdiff with improved output & reporting options - Cliff Yapp
-* 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
-* support non-.g file import in Archer's file open dialog - Cliff Yapp
-* added brep support to g2asc and asc2g - Cliff Yapp
-* fixed a CPU affinity locking bug on Linux platforms - Sean Morrison
-* fixed mged -c crash running view-modifying commands - Sean Morrison
-* improved kill, killall, killtree documentation - Sean Morrison
-* added killtree -f force flag to kill unconditionally - Sean Morrison
-* killtree now defaults to skipping referenced objects - Sean Morrison
-* nirt -h option is now help, old -h is -H - Carl Moore
-* implemented preliminary NURBS geometry Boolean evaluation
-	- Wu Jianbang, Nick Reed, Cliff Yapp
-* improved step-g assembly hierarchy import support - Keith Bowman
-* fixed rtweight when using the -G grid spacing option - Sean Morrison
-* fixed memory leaks in a number of pix utilities - Cezar Elnazi
-* improved NURBS ray tracing & tessellation robustness - Keith Bowman
-* improved step-g NURBS geometry import robustness - Keith Bowman
-* added -v verbose output option to MGED 'search' command - Cliff Yapp
-* fixed g_lint and pixcount red-black tree memory leaks - Tom Browder
-* fixed crash of extrude with special case bezier curves - huskmate13
-* improved performance of 'terrain' & numerous shaders - Sean Morrison
-* new manual pages for rtexample and brep_simple - Shardul Chiplunkar
-* added key binding to reopen/focus mged command window - Emory Huff
-* added menu option to restore mged command window - Cezar Elnazli
-* search command now recognizes hyp and metaball types - Cliff Yapp
 * added -depth option to MGED 'search' command - Cliff Yapp
 * improved 'search' with 'flat' search path modifier - Cliff Yapp
 * improved 'search' with above/equal/below depth limits - Cliff Yapp
-* added comb -S option to stop when object already exists - Cliff Yapp
-* improved comb command documentation with many examples - Cliff Yapp
-
-
----------------------------------------------------------------------
--- 2014-06-02  Release 7.24.2                                     ---
----------------------------------------------------------------------
-
-This patch release includes a plethora of significant bug fixes and
-improvements to BRL-CAD including fixing ADRT/TIE fast triangle ray
-tracing on 32-bit platforms, fixing an issue in our FASTGEN converter
-that affected the import of very complex geometry models, upgrading
-one of our third-party dependencies (libpng) in response to a
-vulnerability report, and improving the 'comb' and 'search' commands
-with new options for restructuring and searching geometry.
-Enhancements continue to be made to our boundary representation (BREP)
-NURBS infrastructure in support of hybrid representation modeling and
-improved geometry interchange with other CAD systems.
-
-* improved rcodes output to inform user what changed - Cliff Yapp
-* fixed inside command for ellipsoid primitives - Cliff Yapp
-* restored suppressed mged output after some commands - Cliff Yapp
-* added rtwizard -s square image size option - Cliff Yapp
-* documented image size options in rtwizard man page - Cliff Yapp
-* added view center specification dialog to rtwizard - Cliff Yapp
-* increased rtwizard window size for button visibility - Cliff Yapp
-* image conversion -R/-G/-B options now require weight - Mohit Daga
-* improved option consistency for image processing tools - Mohit Daga
-* improved pipe ray tracing grazing hit behavior - Keith Bowman
-* upgraded libpng, now at version 1.6.10 - Erik Greenwald, Cliff Yapp
-* improved solid NURBS geometry ray tracing behavior - Keith Bowman
-* fix z-clipping bug in MGED's X display manager - Cliff Yapp
 * added attribute sorting option to the 'attr' command - Tom Browder
 * changed 'bwfilter' tool offset option from -o to -O - Mohit Daga
 * gattributes section 5 man page renamed to attributes - Tom Browder
 * changed 'benchmark' defaults: 2% deviation, 5 frames - Sean Morrison
 * improved bwrect to handle redirected input and output - Mohit Daga
-* upgraded boost to version 1.55.0 - Tom Browder
 * fixed TIE mesh raytrace crashes on 32-bit platforms - Sean Morrison
 * fixed pixscale and bwscale to not output ioctl error - Mohit Daga
-* improved fast4-g import of numerous region groups - Richard Weiss
-* fixed archer hidden line edit getting redrawn as shaded - Nick Reed
 * fixed adrt/TIE polygonal mesh memory management bug - Richard Weiss
 * fixed fast4-g importer parsing of blank input lines - Richard Weiss
 * added -o flag to 'bb' command for oriented bounding box - Cliff Yapp
 * allow search to see hidden combs with the -a flag - Cliff Yapp
 * added comb -l lift option to change region designation - Cliff Yapp
-* improved NURBS ray tracing grazing hit behavior - Keith Bowman
 * print current grid information in gqa output - Cliff Yapp
 * added -f option for flattening combs to 'comb' command - Cliff Yapp
-* added support for -bool operation filtering in search - Cliff Yapp
+* added support for boolean op filtering in search - Cliff Yapp
 * added new g-raw geometry converter - Jon Engbert, Daniel Roßberg
 * improved g-stl usage and documentation - Jon Engbert
 * added -c and -r region flag options to the comb command - Cliff Yapp
@@ -112,6 +46,7 @@ improved geometry interchange with other CAD systems.
 * pipe centroid, volume, & surface area analyze reporting - Csaba Nagy
 * added ebm centroid 'analyze' command reporting - Michael Huang
 * improved help option consistency across numerous tools - Carl Moore
+* upgraded libpng to 1.6.3 - Erik Greenwald


 ----------------------------------------------------------------------
@@ -202,7 +137,6 @@ including the STEP, Patch, and 3DM importers.
 * improved documentation consistency and authorship info - Tom Browder
 * new mouse-input unpushed matrix edit option in archer - Bob Parker
 * fixed bug during pipe editing with working units set - Bob Parker
-* added experimental 'bot_fuse' command to heal BoTs - Richard Weiss


 ----------------------------------------------------------------------
@@ -1,5 +1,5 @@
 			    BRL-CAD
-			 Release 7.26.0
+			 Release 7.24.2
 		       http://brlcad.org/

 BRL-CAD is a powerful cross-platform open source combinatorial
@@ -2,7 +2,7 @@
 #                          L G T . S H
 # BRL-CAD
 #
-# Copyright (c) 2004-2014 United States Government as represented by
+# Copyright (c) 2004-2013 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -1,7 +1,7 @@
 /*                        P I X C M P . C
 * BRL-CAD
 *
- * Copyright (c) 2004-2014 United States Government as represented by
+ * Copyright (c) 2004-2013 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This program is free software; you can redistribute it and/or
@@ -31,12 +31,13 @@

 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+#endif
 #include "bio.h"

-#include "bu/getopt.h"
-#include "bu/log.h"
-#include "bu/file.h"
-#include "bu/str.h"
+#include "bu.h"
+

 /* exit codes for argument processing errors */
 #define OPTS_ERROR 127
@@ -2,7 +2,7 @@
 #                          R U N . S H
 # BRL-CAD
 #
-# Copyright (c) 2004-2014 United States Government as represented by
+# Copyright (c) 2004-2013 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -1496,7 +1496,7 @@ else
    $ECHO
    blankit=no

-    # BSD+
+    # BSD
    look_for executable "a sysctl command" SYSCTL_CMD `echo "$PATH" | tr ":" "\n" | sed 's/$/\/sysctl/g'`
    if test ! "x$SYSCTL_CMD" = "x" ; then
 	$ECHO "Collecting system state information (via $SYSCTL_CMD)"
@@ -1563,19 +1563,6 @@ else
 	blankit=yes
    fi

-    # Linux+
-    look_for executable "an lscpu command" LSCPU_CMD `echo $PATH | tr ":" "\n" | sed 's/$/\/lscpu/g'`
-    if test ! "x$LSCPU_CMD" = "x" ; then
-	$ECHO "Collecting system CPU information (via $LSCPU_CMD)"
-	preQUIET="$QUIET"
-	QUIET=1
-	$ECHO "==============================================================================="
-	$ECHO "`$LSCPU_CMD 2>&1`"
-	$ECHO
-	QUIET="$preQUIET"
-	blankit=yes
-    fi
-
    if test "x$blankit" = "xyes" ; then
 	$ECHO
    fi
@@ -2,7 +2,7 @@
 #                          T R Y . S H
 # BRL-CAD
 #
-# Copyright (c) 2004-2014 United States Government as represented by
+# Copyright (c) 2004-2013 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -2,7 +2,7 @@
 #                    V I E W D I F F . S H
 # BRL-CAD
 #
-# Copyright (c) 2004-2014 United States Government as represented by
+# Copyright (c) 2004-2013 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -66,17 +66,13 @@ do
                                  shift;;
     --disable-strict-compile-flags)                options="$options -DBRLCAD_ENABLE_STRICT=OFF";
                                  shift;;
-     --enable-all-cxx)                options="$options -DENABLE_ALL_CXX_COMPILE=ON";
-                                  shift;;
-     --disable-all-cxx)                options="$options -DENABLE_ALL_CXX_COMPILE=OFF";
-                                  shift;;
     --enable-posix)                options="$options -DENABLE_POSIX_COMPLIANCE=ON";
                                  shift;;
     --disable-posix)                options="$options -DENABLE_POSIX_COMPLIANCE=OFF";
                                  shift;;
-     --strict-iso-c)                options="$options -DENABLE_STRICT_COMPILER_STANDARD_COMPLIANCE=ON";
+     --enable-c99)                options="$options -DENABLE_C99_COMPLIANCE=ON";
                                  shift;;
-     --strict-iso-c)                options="$options -DENABLE_STRICT_COMPILER_STANDARD_COMPLIANCE=OFF";
+     --disable-c99)                options="$options -DENABLE_C99_COMPLIANCE=OFF";
                                  shift;;
     --enable-docs)                options="$options -DBRLCAD_EXTRADOCS=ON";
                                  shift;;
@@ -90,30 +86,6 @@ do
                                  shift;;
     --disable-docbook)                options="$options -DBRLCAD_EXTRADOCS=OFF";
                                  shift;;
-     --enable-lemon)                options="$options -DBRLCAD_LEMON=BUNDLED";
-                                  shift;;
-     --disable-lemon)                options="$options -DBRLCAD_LEMON=SYSTEM";
-                                  shift;;
-     --enable-re2c)                options="$options -DBRLCAD_RE2C=BUNDLED";
-                                  shift;;
-     --disable-re2c)                options="$options -DBRLCAD_RE2C=SYSTEM";
-                                  shift;;
-     --enable-perplex)                options="$options -DBRLCAD_PERPLEX=BUNDLED";
-                                  shift;;
-     --disable-perplex)                options="$options -DBRLCAD_PERPLEX=SYSTEM";
-                                  shift;;
-     --enable-astyle)                options="$options -DBRLCAD_ASTYLE=BUNDLED";
-                                  shift;;
-     --disable-astyle)                options="$options -DBRLCAD_ASTYLE=SYSTEM";
-                                  shift;;
-     --enable-xsltproc)                options="$options -DBRLCAD_XSLTPROC=BUNDLED";
-                                  shift;;
-     --disable-xsltproc)                options="$options -DBRLCAD_XSLTPROC=SYSTEM";
-                                  shift;;
-     --enable-xmllint)                options="$options -DBRLCAD_XMLLINT=BUNDLED";
-                                  shift;;
-     --disable-xmllint)                options="$options -DBRLCAD_XMLLINT=SYSTEM";
-                                  shift;;
     --enable-regex)                options="$options -DBRLCAD_REGEX=BUNDLED";
                                  shift;;
     --disable-regex)                options="$options -DBRLCAD_REGEX=SYSTEM";
@@ -126,9 +98,25 @@ do
                                  shift;;
     --disable-libz)                options="$options -DBRLCAD_ZLIB=SYSTEM";
                                  shift;;
-     --enable-freetype)                options="$options -DBRLCAD_FREETYPE=BUNDLED";
+     --enable-lemon)                options="$options -DBRLCAD_LEMON=BUNDLED";
                                  shift;;
-     --disable-freetype)                options="$options -DBRLCAD_FREETYPE=SYSTEM";
+     --disable-lemon)                options="$options -DBRLCAD_LEMON=SYSTEM";
+                                  shift;;
+     --enable-re2c)                options="$options -DBRLCAD_RE2C=BUNDLED";
+                                  shift;;
+     --disable-re2c)                options="$options -DBRLCAD_RE2C=SYSTEM";
+                                  shift;;
+     --enable-perplex)                options="$options -DBRLCAD_PERPLEX=BUNDLED";
+                                  shift;;
+     --disable-perplex)                options="$options -DBRLCAD_PERPLEX=SYSTEM";
+                                  shift;;
+     --enable-xsltproc)                options="$options -DBRLCAD_XSLTPROC=BUNDLED";
+                                  shift;;
+     --disable-xsltproc)                options="$options -DBRLCAD_XSLTPROC=SYSTEM";
+                                  shift;;
+     --enable-xmllint)                options="$options -DBRLCAD_XMLLINT=BUNDLED";
+                                  shift;;
+     --disable-xmllint)                options="$options -DBRLCAD_XMLLINT=SYSTEM";
                                  shift;;
     --enable-termlib)                options="$options -DBRLCAD_TERMLIB=BUNDLED";
                                  shift;;
@@ -178,33 +166,25 @@ do
                                  shift;;
     --disable-opennurbs)                options="$options -DBRLCAD_OPENNURBS=SYSTEM";
                                  shift;;
-     --enable-scl)                options="$options -DBRLCAD_SC=BUNDLED";
+     --enable-scl)                options="$options -DBRLCAD_SCL=BUNDLED";
                                  shift;;
-     --disable-scl)                options="$options -DBRLCAD_SC=SYSTEM";
+     --disable-scl)                options="$options -DBRLCAD_SCL=SYSTEM";
                                  shift;;
-     --enable-step)                options="$options -DBRLCAD_SC=BUNDLED";
+     --enable-step)                options="$options -DBRLCAD_SCL=BUNDLED";
                                  shift;;
-     --disable-step)                options="$options -DBRLCAD_SC=SYSTEM";
+     --disable-step)                options="$options -DBRLCAD_SCL=SYSTEM";
                                  shift;;
-     --enable-step-class-libraries)                options="$options -DBRLCAD_SC=BUNDLED";
+     --enable-step-class-libraries)                options="$options -DBRLCAD_SCL=BUNDLED";
                                  shift;;
-     --disable-step-class-libraries)                options="$options -DBRLCAD_SC=SYSTEM";
+     --disable-step-class-libraries)                options="$options -DBRLCAD_SCL=SYSTEM";
                                  shift;;
-     --enable-vds)                options="$options -DBRLCAD_VDS=BUNDLED";
+     --enable-vds)                options="$options -DBRLCAD_LIBVDS=BUNDLED";
                                  shift;;
-     --disable-vds)                options="$options -DBRLCAD_VDS=SYSTEM";
+     --disable-vds)                options="$options -DBRLCAD_LIBVDS=SYSTEM";
                                  shift;;
-     --enable-openscenegraph)                options="$options -DBRLCAD_OSG=BUNDLED";
+     --enable-gdiam)                options="$options -DBRLCAD_LIBGDIAM=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";
-                                  shift;;
-     --enable-bullet)                options="$options -DBRLCAD_BULLET=BUNDLED";
-                                  shift;;
-     --disable-bullet)                options="$options -DBRLCAD_BULLET=SYSTEM";
+     --disable-gdiam)                options="$options -DBRLCAD_LIBGDIAM=SYSTEM";
                                  shift;;
     --prefix=*)   	          inputstr=$1;
 				  options="$options -DCMAKE_INSTALL_PREFIX=${inputstr#--prefix=}";
@@ -8,6 +8,7 @@ set(G_BENCHMARK_MODELS
 )

 set(G_SAMPLE_MODELS
+  ${G_BENCHMARK_MODELS}
  axis.asc
  boolean-ops.asc
  castle.asc
@@ -36,26 +37,6 @@ set(G_SAMPLE_MODELS
  xmp.asc
 )

-macro(ADD_G_TARGET g_model folder)
-  string(REGEX REPLACE "([0-9a-z]*).asc" "\\1" g_model_root "${g_model}")
-  set(output_file ${bin_root}/${DATA_DIR}/db/${g_model_root}.g)
-  add_custom_command(
-    OUTPUT ${output_file}
-    COMMAND asc2g ${CMAKE_CURRENT_SOURCE_DIR}/${g_model} ${output_file}
-    DEPENDS asc2g ${CMAKE_CURRENT_SOURCE_DIR}/${g_model}
-  )
-  add_custom_target(${g_model_root}.g ALL DEPENDS ${output_file})
-  set_target_properties(${g_model_root}.g PROPERTIES FOLDER "${folder}")
-  if(BRLCAD_INSTALL_EXAMPLE_GEOMETRY)
-    if(NOT "${CMAKE_CFG_INTDIR}" STREQUAL "." AND CMAKE_CONFIGURATION_FILES)
-      string(REPLACE "${CMAKE_CFG_INTDIR}" "\${BUILD_TYPE}" output_file "${output_file}")
-    endif(NOT "${CMAKE_CFG_INTDIR}" STREQUAL "." AND CMAKE_CONFIGURATION_FILES)
-    install(FILES ${output_file} DESTINATION ${DATA_DIR}/db)
-  endif(BRLCAD_INSTALL_EXAMPLE_GEOMETRY)
-  set(BUILT_MODELS "${BUILT_MODELS};${output_file}")
-endmacro(ADD_G_TARGET g_model folder)
-
-
 # Get our root path
 if(CMAKE_CONFIGURATION_TYPES)
  set(bin_root "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}")
@@ -72,17 +53,26 @@ else(CMAKE_CONFIGURATION_TYPES)
  file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DATA_DIR}/db)
 endif(CMAKE_CONFIGURATION_TYPES)

-foreach(g_input ${G_BENCHMARK_MODELS})
-  ADD_G_TARGET(${g_input} "BRL-CAD Geometry Models/Benchmark")
-endforeach(g_input ${G_BENCHMARK_MODELS})
-CMAKEFILES(${G_BENCHMARK_MODELS})
-
-foreach(g_input ${G_SAMPLE_MODELS})
-  ADD_G_TARGET(${g_input} "BRL-CAD Geometry Models/Sample")
-endforeach(g_input ${G_SAMPLE_MODELS})
+foreach(g_model ${G_SAMPLE_MODELS})
+  string(REGEX REPLACE "([0-9a-z]*).asc" "\\1" g_model_root "${g_model}")
+  set(output_file ${bin_root}/${DATA_DIR}/db/${g_model_root}.g)
+  add_custom_command(
+    OUTPUT ${output_file}
+    COMMAND asc2g ${CMAKE_CURRENT_SOURCE_DIR}/${g_model} ${output_file}
+    DEPENDS asc2g ${CMAKE_CURRENT_SOURCE_DIR}/${g_model}
+  )
+  add_custom_target(${g_model_root}.g ALL DEPENDS ${output_file})
+  if(BRLCAD_INSTALL_EXAMPLE_GEOMETRY)
+    if(NOT "${CMAKE_CFG_INTDIR}" STREQUAL "." AND CMAKE_CONFIGURATION_FILES)
+      string(REPLACE "${CMAKE_CFG_INTDIR}" "\${BUILD_TYPE}" output_file "${output_file}")
+    endif(NOT "${CMAKE_CFG_INTDIR}" STREQUAL "." AND CMAKE_CONFIGURATION_FILES)
+    install(FILES ${output_file} DESTINATION ${DATA_DIR}/db)
+  endif(BRLCAD_INSTALL_EXAMPLE_GEOMETRY)
+  set(BUILT_MODELS "${BUILT_MODELS};${output_file}")
+endforeach(g_model ${G_SAMPLE_MODELS})
 CMAKEFILES(${G_SAMPLE_MODELS})

-set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${BUILT_MODELS}")
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${BUILT_MODELS}")

 if(BRLCAD_INSTALL_EXAMPLE_GEOMETRY)
   BRLCAD_ADDDATA(terra.dsp db)
@@ -2,7 +2,7 @@
 #                         C U B E . R T
 # BRL-CAD
 #
-# Copyright (c) 2004-2014 United States Government as represented by
+# Copyright (c) 2004-2013 United States Government as represented by
 # the U.S. Army Research Laboratory.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -2,7 +2,7 @@
 /*                         D B . P H P
 * BRL-CAD
 *
- * Copyright (c) 2004-2014 United States Government as represented by
+ * Copyright (c) 2004-2013 United States Government as represented by
 * the U.S. Army Research Laboratory.
 *
 * This library is free software; you can redistribute it and/or
@@ -275,14 +275,12 @@ if ($physicalFile) {

 debug("END http request");

-?>

-<!--
-  Local Variables:
-  tab-width: 8
-  mode: php
-  c-basic-offset: 4
-  indent-tabs-mode: t
-  End:
-  ex: shiftwidth=4 tabstop=8
- -->
+# Local Variables: ***
+# mode: C ***
+# tab-width: 8 ***
+# c-basic-offset: 2 ***
+# indent-tabs-mode: t ***
+# End: ***
+# ex: shiftwidth=2 tabstop=8
+?>
@@ -65,7 +65,7 @@
@TECHREPORT{Muuss87b,
  author = {Muuss, Michael John and Dykstra, P. and Applin, K. and Moss, G. and Davisson, E. and Stay, P. and Kennedy, C.},
  title = {Ballistic Research Laboratory CAD Package, Release 1.21},
-  publisher = {The U.S. Army Ballistic Research Laboratory},
+  publisher = "The U.S. Army Ballistic Research Laboratory},
  year = {1987},
  month = {June},
  address = {Aberdeen Proving Ground, Maryland 21005-5066},
@@ -640,20 +640,6 @@
  timestamp = {2008.02.05}
 }

-@PROCEEDING{doi:10.1117/12.960423,
-author = {Jones, J. and Gonda, T.},
-title = {A Thermal Model Preprocessor For Graphics And Material Database Generation},
-journal = {Proc. SPIE},
-volume = {1098},
-number = {},
-pages = {42-54},
-abstract = {The process of developing a physical description of a target for thermal models is a time consuming and tedious task. The problem is one of data collection, data manipulation, and data storage. Information on targets can come from many sources and therefore could be in any form (2-D drawings, 3-D wireframe or solid model representations, etc.). TACOM has developed a preprocessor that decreases the time involved in creating a faceted target representation. This program allows the user to create the graphics for the vehicle and to assign the material properties to the graphics. The vehicle description file is then automatically generated by the preprocessor. By containing all the information in one database, the modeling process is made more accurate and data tracing can be done easily. A bridge to convert other graphics packages (such as BRL-CAD) to a faceted representation is being developed. When the bridge is finished, this preprocessor will be used to manipulate the converted data.},
-year = {1989},
-doi = {10.1117/12.960423},
-URL = { http://dx.doi.org/10.1117/12.960423},
-eprint = {}
-}
-
@INCOLLECTION{Deitz90b,
  author = {Deitz, Paul H.},
  title = {High-Resolution, Item-Level Weapons Modeling},
@@ -1,13 +1,11 @@
 if(BRLCAD_EXTRADOCS)
-  verbose_add_subdirectory(doc docbook)
+  add_subdirectory(docbook)
 else(BRLCAD_EXTRADOCS)
  CMAKEFILES(docbook)
 endif(BRLCAD_EXTRADOCS)

-verbose_add_subdirectory(doc html)
-verbose_add_subdirectory(doc legal)
-
-CMAKEFILES(parsers)
+add_subdirectory(html)
+add_subdirectory(legal)

 set(documentation_DATA
  IDEAS
@@ -25,10 +23,12 @@ set(documentation_DATA
  anim.txt
  archer_ack.txt
  benchmark.tr
+  bison_to_lemon.txt
  brep.txt
  BRL-CAD.bib
  cvs.txt
  description.txt
+  flex_to_re2c.txt
  ged.tr
  history.txt
  hypot.txt
@@ -220,10 +220,8 @@ configure_file(pad_file.xml.in ${CMAKE_CURRENT_BINARY_DIR}/pad_file.xml @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pad_file.xml DESTINATION ${DOC_DIR})

 CMAKEFILES(
-  README.OSCON-2014
  STARTERS
  burst
-  csv_to_comgeom.txt
  implicit_constraints.txt
  pad_file.xml.in
  )
@@ -79,7 +79,7 @@ available to receive files as well as for the evaluation of raw
 throughput performance of the network connection between the two
 systems.  TTCP includes support for sourcing to/from memory, variable
 packet sizes, and loading metrics.  TTCP is described as a standard
-testing tool for TCP implementers via Network Working Group RFC 2398.
+testing tool for TCP implementors via Network Working Group RFC 2398.

 = Geometry Modeling Kernel =

@@ -85,13 +85,6 @@ non-parallel build will still succeed.  Another workaround is to build
 just subdirectories (e.g. src/other, doc, etc.) individually and then
 do a toplevel make in non-parallel mode to finalize the build.

-OpenSceneGraph and OSX
----------------------
-For 32bit OSX builds of an X11+OpenSceneGraph BRL-CAD:
-cmake .. -DBRLCAD_BUNDLED_LIBS=BUNDLED -DBRLCAD_ENABLE_OSG=ON
-DBRLCAD_REGEX=SYSTEM -DBRLCAD_WORD_SIZE=32BIT -DOSG_WINDOWING_SYSTEM=X11
-
-
 Tips
 ----

@@ -1,53 +0,0 @@
-BRL-CAD:  A Vibrant Open Source Model
-
-+ intro
-
-  - speaker
-
-  - old vs. new (Rurel's joke about old farmer and his young farmhand)
-
-+ overview
-
-  - history, players
-
-     Mike Muuss [author of ping]
-
-  - license
-
-  - languages (Ohloh stats)
-
-+ important technical features
-
-  - database format
-
-  - tools
-
-  - libraries
-
-  - use of other FOSS libraries
-
-  - road map
-
-+ other features
-
-+ community
-
-  - players (Ohloh stats)
-
-+ process
-
-  - Source Forge
-
-  - API changes
-
-  - deprecation policy
-
-  - release procedures
-
-  - version control
-
-  - bug tracking
-
- policy
-
- outreach
@@ -17,6 +17,6 @@ topmenu\
 "

 for table in $tables ; do
-  tbl $table.tbl > $table.mm
+  gtbl $table.tbl > $table.mm
 done

@@ -85,7 +85,7 @@ the screen is divided into sections of one or more rows (lines) of text.
 The top line,
 referred to as line 1,
 is reserved for
-CPU
+.SM CPU
 usage statistics.
 Starting on line 2,
 the hierarchical menu region spans 12 lines of the screen.
@@ -612,7 +612,7 @@ then a burst point will be located the absolute value of \fIburst distance\fR
 beyond the exit of the shotline from the component.
 This means that if \fIburst distance\fR is zero,
 the burst point will lie at the \fIburst armor/air\fR interface,
-and if it's -5.5,
+and if its -5.5,
 the burst point will lie 5.5 units inside the air compartment from the
 back surface of the armor.
 .Ce
@@ -933,7 +933,7 @@ that has long been a bottleneck to the vulnerability and lethality analyst,
 will increase dramatically.
 Another benefit will be increased accuracy of results due to the superior
 detail and accuracy afforded by a true combinatorial solid geometry modeler.
-.H 1 Acknowledgments
+.H 1 Acknowledgements
 The author would like to thank Leonard E. Bruenning, Jr. of Sverdrup
 Technology, Inc. for his thorough, concise and well-illustrated
 documentation\*F of the requirements to be met by the \*(b) program
@@ -1,7 +1,7 @@
 #!/bin/sh

-MASTER=burst
-#MASTER=debug
+#MASTER=burst
+MASTER=debug

 doclifter -h hints.txt -x -vvvv $MASTER.mm #2>t

@@ -4,7 +4,11 @@
 "\fIGary S. Moss"
 .sp
 .ce 4
-"\fRBRL-CAD Open Source"
+"\fRVulnerability Methodology Branch"
+"Vulnerability/Lethality Division"
+"USA Ballistic Research Laboratory"
+"SLCBR-VL-V"
+"Aberdeen Proving Ground, MD  21005-5066"
 .sp
 .ce
 "moss@vmb.brl.mil"
@@ -1,17 +0,0 @@
-These are some notes about using text manipulation tools to try taking the csv
-text files from GCI's transcription work and formatting them as comgeom files.
-I don't think they're fully working as yet, but certainly they are a starting
-point.
-
-tr "\r" "\n" < in_raw.csv > in.csv
-
-Solid table:
-
-awk -F, 'BEGIN {widthlist = "3 3 10 10 10 10 10 10 10"; split (widthlist, widths, " ")}{for(i=1;i<=NF;i++){printf "%-*s", widths[i],$i};printf "\n"}' in.csv
-
-Region table:
-awk -F, 'BEGIN {widthlist = "5 2 5 7 7 7 7 7 7 7 2 5 10"; split (widthlist, widths, " ")}{for(i=1;i<=NF;i++){printf "%-*s", widths[i],$i};printf "\n"}' in.csv
-
-Ident table:
-awk -F, 'BEGIN {widthlist = "10 10 10 43 3 3"; split (widthlist, widths, " ")}{for(i=1;i<=NF;i++){printf "%-*s", widths[i],$i};printf "\n"}' in.csv
-
@@ -51,25 +51,21 @@ add_subdirectory(system)
 # macros, define convenience targets
 if(BRLCAD_EXTRADOCS_HTML)
  get_property(BRLCAD_EXTRADOCS_HTML_TARGETS GLOBAL PROPERTY BRLCAD_EXTRADOCS_HTML_TARGETS)
-  add_custom_target(doc_html DEPENDS ${BRLCAD_EXTRADOCS_HTML_TARGETS})
-  set_target_properties(doc_html PROPERTIES FOLDER "DocBook")
+  add_custom_target(html DEPENDS ${BRLCAD_EXTRADOCS_HTML_TARGETS})
 endif(BRLCAD_EXTRADOCS_HTML)
 if(BRLCAD_EXTRADOCS_MAN)
  get_property(BRLCAD_EXTRADOCS_MAN_TARGETS GLOBAL PROPERTY BRLCAD_EXTRADOCS_MAN_TARGETS)
-  add_custom_target(doc_man DEPENDS ${BRLCAD_EXTRADOCS_MAN_TARGETS})
-  set_target_properties(doc_man PROPERTIES FOLDER "DocBook")
+  add_custom_target(man DEPENDS ${BRLCAD_EXTRADOCS_MAN_TARGETS})
 endif(BRLCAD_EXTRADOCS_MAN)
 if(BRLCAD_EXTRADOCS_PDF)
  get_property(BRLCAD_EXTRADOCS_PDF_TARGETS GLOBAL PROPERTY BRLCAD_EXTRADOCS_PDF_TARGETS)
-  add_custom_target(doc_pdf DEPENDS ${BRLCAD_EXTRADOCS_PDF_TARGETS})
-  set_target_properties(doc_pdf PROPERTIES FOLDER "DocBook")
+  add_custom_target(pdf DEPENDS ${BRLCAD_EXTRADOCS_PDF_TARGETS})
 endif(BRLCAD_EXTRADOCS_PDF)
 if(BRLCAD_EXTRADOCS_HTML OR BRLCAD_EXTRADOCS_MAN OR BRLCAD_EXTRADOCS_PDF)
-  add_custom_target(doc_all DEPENDS
+  add_custom_target(doc DEPENDS
 	${BRLCAD_EXTRADOCS_HTML_TARGETS}
 	${BRLCAD_EXTRADOCS_MAN_TARGETS}
 	${BRLCAD_EXTRADOCS_PDF_TARGETS})
-  set_target_properties(doc_all PROPERTIES FOLDER "DocBook")
 endif(BRLCAD_EXTRADOCS_HTML OR BRLCAD_EXTRADOCS_MAN OR BRLCAD_EXTRADOCS_PDF)

 CMAKEFILES(README fop.xconf.in log4j.properties resources)
@@ -24,7 +24,7 @@ lessons/
 resources/
 	The DocBook xsl files are contained within the "other"
 	subdirectory.  Also included there are various directories and
-	files associated with DB validation, fonts, and hyphenation.
+	files associated with DB validation, fonts, snd hyphenation.
 	The "brlcad" subdirectory contains files customized for
 	BRL-CAD products including common files and images.

@@ -68,7 +68,7 @@ the file 'README.DB_authors_notes'.
 The text character code requirements may eventually be enforced by a
 pre-commit hook script.

-CONVERTING MAN FORMAT TO DOCBOOK
+CONVERTING MAN FORMAT TO DOCBBOOK
 ---------------------------------

 The doclifter program (available in a Debian or Ubuntu distribution)
@@ -103,9 +103,9 @@ documents:
  For pdf documents:

    * fop
-	a java program provided by the Apache Software Foundation; note
+	a java program provide by the Apache Software Foundation; note
 	that a minimum of version 1.0 is required to use the
-	hyphenation binaries provided in the resources sub-directory
+	hyphenation binaries provided in thre resources sub-directory
 	(see http://xmlgraphics.apache.org/fop/).  Also, version 1.0
 	has some new font support features and we recommend using that
 	version (or later) for DB processing.
@@ -1,4 +1,6 @@
-<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+<?xml version="1.0"?>
+<article xmlns="http://docbook.org/ns/docbook" version="5.0"
+         xmlns:xlink="http://www.w3.org/1999/xlink">

  <info>
    <title>Article Title</title>
@@ -79,14 +81,7 @@
        <title>Example embedded image text.</title>
      </info>
      <mediaobject>
-        <imageobject role="html">
-          <!--
-               NOTE: fileref will normally be something like
-               "../../articles/en/images/nirt_fig02.png" NOT http: URL
-               -->
-          <imagedata align="center" fileref="http://brlcad.org/images/logo/BRL-CAD_256x256.png" format="PNG" width="64"/>
-        </imageobject>
-        <imageobject role="fo">
+        <imageobject>
          <!--
               NOTE: fileref will normally be something like
               "../../articles/en/images/nirt_fig02.png" NOT http: URL
@@ -103,7 +98,7 @@

    <para>
      Another image, but rendered inline
-      <inlinemediaobject><imageobject role="html"><imagedata fileref="http://brlcad.org/images/logo/BRL-CAD_64x64.png" format="PNG" width="64"/></imageobject><imageobject role="fo"><imagedata fileref="http://brlcad.org/images/logo/BRL-CAD_64x64.png" format="PNG" width="64"/></imageobject></inlinemediaobject>
+      <inlinemediaobject><imageobject><imagedata fileref="http://brlcad.org/images/logo/BRL-CAD_64x64.png" format="PNG" width="64"/></imageobject></inlinemediaobject>
      with the paragraph text.
    </para>

@@ -78,7 +78,7 @@
      applications comprising more than a million lines of source
      code.  The package is intentionally designed to be extensively
      cross-platform and is actively developed on and maintained for
-      many common operating system environments including BSD,
+      many common operating system environments including for BSD,
      Linux, Solaris, Mac OS X, and Windows among others.  BRL-CAD is
      distributed in binary and source code form as free open source
      software (FOSS), provided under Open Source Initiative (OSI)
@@ -1,4 +1,8 @@
-<article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0">
+<!-- Converted by db4-upgrade version 1.0 -->
+
+<article xmlns="http://docbook.org/ns/docbook" version="5.0"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+>
  <info><title>Using the Build Pattern Tool</title>


@@ -27,7 +31,7 @@
    <para>
      There are many input fields. Some stand alone, and others belong to series
      that work together to provide the needed information for a specific
-      option. Each series is denoted by a diamond-shaped check box. If the
+      option. Each series is demarked by a diamond-shaped check box. If the
      diamond is highlighted red, then all fields in that series are required.
      All required fields must be filled in for the pattern tool to work
      properly. It is also important to note that all dimensions must be in
@@ -76,10 +80,7 @@
    <figure><info><title>Example of pattern-generated assembly names.</title></info>

      <mediaobject>
-	<imageobject role="html">
-	  <imagedata align="center" fileref="../../articles/en/images/build_pattern_fig01.png" format="PNG"/>
-	</imageobject>
-      <imageobject role="fo">
+	<imageobject>
 	  <imagedata align="center" fileref="../../articles/en/images/build_pattern_fig01.png" format="PNG"/>
 	</imageobject>
      </mediaobject>
@@ -91,7 +92,7 @@
      increment, examine the primitives of the object(s) you wish to pattern and find
      the largest span. For example, to create a pattern to the primitive level with
      the following primitives (which may or may not be in regions or
-      assemblies):
+      assemblies),

      <literallayout class="normal">
 part.s22 part.s22-1 part.s23 part.s24 part.s24+1 part.s24-1 part.s25,
@@ -131,7 +132,7 @@ part.s26 part.s26-1 part.s27 part.s28 part.s28+1 part.s28-1 part.s29
     thorough and name each primitive, region, and assembly properly. Consider
     the following example:

-     <inlinemediaobject><imageobject role="html"><imagedata fileref="../../articles/en/images/build_pattern_fig07.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../articles/en/images/build_pattern_fig07.png"/></imageobject></inlinemediaobject>
+     <inlinemediaobject><imageobject><imagedata fileref="../../articles/en/images/build_pattern_fig07.png"/></imageobject></inlinemediaobject>
    </para>
    <para>
      Top-level duplications copy the patterned object and reference its entire
@@ -185,10 +186,7 @@ part.s26 part.s26-1 part.s27 part.s28 part.s28+1 part.s28-1 part.s29
    <figure><info><title>The user interface for building rectangular patterns.</title></info>

      <mediaobject>
-	<imageobject role="html">
-	  <imagedata align="center" fileref="../../articles/en/images/build_pattern_fig02.png" format="PNG"/>
-	</imageobject>
-      <imageobject role="fo">
+	<imageobject>
 	  <imagedata align="center" fileref="../../articles/en/images/build_pattern_fig02.png" format="PNG"/>
 	</imageobject>
      </mediaobject>
@@ -242,10 +240,7 @@ part.s26 part.s26-1 part.s27 part.s28 part.s28+1 part.s28-1 part.s29
    <figure><info><title>The user interface for building spherical patterns.</title></info>

      <mediaobject>
-	<imageobject role="html">
-	  <imagedata align="center" fileref="../../articles/en/images/build_pattern_fig03.png" format="PNG"/>
-	</imageobject>
-      <imageobject role="fo">
+	<imageobject>
 	  <imagedata align="center" fileref="../../articles/en/images/build_pattern_fig03.png" format="PNG"/>
 	</imageobject>
      </mediaobject>
@@ -268,10 +263,7 @@ part.s26 part.s26-1 part.s27 part.s28 part.s28+1 part.s28-1 part.s29
    <figure><info><title>Examples of different spherical pattern orientations.</title></info>

      <mediaobject>
-	<imageobject role="html">
-	  <imagedata align="center" fileref="../../articles/en/images/build_pattern_fig04.png" format="PNG"/>
-	</imageobject>
-      <imageobject role="fo">
+	<imageobject>
 	  <imagedata align="center" fileref="../../articles/en/images/build_pattern_fig04.png" format="PNG"/>
 	</imageobject>
      </mediaobject>
@@ -281,10 +273,7 @@ part.s26 part.s26-1 part.s27 part.s28 part.s28+1 part.s28-1 part.s29
    <figure><info><title>Implementation of spherical patterns.</title></info>

      <mediaobject>
-	<imageobject role="html">
-	  <imagedata align="center" fileref="../../articles/en/images/build_pattern_fig05.png" format="PNG"/>
-	</imageobject>
-      <imageobject role="fo">
+	<imageobject>
 	  <imagedata align="center" fileref="../../articles/en/images/build_pattern_fig05.png" format="PNG"/>
 	</imageobject>
      </mediaobject>
@@ -309,10 +298,7 @@ part.s26 part.s26-1 part.s27 part.s28 part.s28+1 part.s28-1 part.s29
    <figure><info><title>The user interface for building cylindrical patterns.</title></info>

      <mediaobject>
-	<imageobject role="html">
-	  <imagedata align="center" fileref="../../articles/en/images/build_pattern_fig06.png" format="PNG"/>
-	</imageobject>
-      <imageobject role="fo">
+	<imageobject>
 	  <imagedata align="center" fileref="../../articles/en/images/build_pattern_fig06.png" format="PNG"/>
 	</imageobject>
      </mediaobject>
@@ -1,4 +1,8 @@
-<article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0">
+<!-- Converted by db4-upgrade version 1.0 -->
+
+<article xmlns="http://docbook.org/ns/docbook" version="5.0"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+>
  <info><title>Using the build_region Command</title>


@@ -47,10 +51,7 @@
  <figure xml:id="build_region5"><info><title>The rounded corners of a toy wagon.</title></info>

    <mediaobject>
-      <imageobject role="html">
-	<imagedata align="center" fileref="../../articles/en/images/build_region_fig01.png" format="PNG"/>
-      </imageobject>
-    <imageobject role="fo">
+      <imageobject>
 	<imagedata align="center" fileref="../../articles/en/images/build_region_fig01.png" format="PNG"/>
      </imageobject>
    </mediaobject>
@@ -69,10 +70,7 @@
  <figure xml:id="build_region7"><info><title>Arb8, cylinder, and two Boolean primitives.</title></info>

    <mediaobject>
-      <imageobject role="html">
-	<imagedata align="center" fileref="../../articles/en/images/build_region_fig02.png" format="PNG"/>
-      </imageobject>
-    <imageobject role="fo">
+      <imageobject>
 	<imagedata align="center" fileref="../../articles/en/images/build_region_fig02.png" format="PNG"/>
      </imageobject>
    </mediaobject>
@@ -106,10 +104,7 @@ u wgn.s2 + wgn.s2+1 - wgn.s2-1
  <figure xml:id="build_region9"><info><title>The region and the subtraction primitives.</title></info>

    <mediaobject>
-      <imageobject role="html">
-	<imagedata align="center" fileref="../../articles/en/images/build_region_fig03.png" format="PNG"/>
-      </imageobject>
-    <imageobject role="fo">
+      <imageobject>
 	<imagedata align="center" fileref="../../articles/en/images/build_region_fig03.png" format="PNG"/>
      </imageobject>
    </mediaobject>
@@ -124,10 +119,7 @@ u wgn.s2 + wgn.s2+1 - wgn.s2-1
  <figure xml:id="build_region11"><info><title>Raytraced image with hole.</title></info>

    <mediaobject>
-      <imageobject role="html">
-	<imagedata align="center" fileref="../../articles/en/images/build_region_fig04.png" format="PNG"/>
-      </imageobject>
-    <imageobject role="fo">
+      <imageobject>
 	<imagedata align="center" fileref="../../articles/en/images/build_region_fig04.png" format="PNG"/>
      </imageobject>
    </mediaobject>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Using the Extruded Bitmap Primitive</title>

@@ -26,10 +28,7 @@
  <figure xml:id="ebm3"><info><title>Example of the .bw image used for ebm.</title></info>

    <mediaobject>
-      <imageobject role="html">
-	<imagedata align="center" fileref="../../articles/en/images/ebm_primitive_fig01.png" format="PNG"/>
-      </imageobject>
-    <imageobject role="fo">
+      <imageobject>
 	<imagedata align="center" fileref="../../articles/en/images/ebm_primitive_fig01.png" format="PNG"/>
      </imageobject>
    </mediaobject>
@@ -38,10 +37,7 @@
  <figure xml:id="ebm4"><info><title>Example of ebm.</title></info>

    <mediaobject>
-      <imageobject role="html">
-	<imagedata align="center" fileref="../../articles/en/images/ebm_primitive_fig02.png" format="PNG"/>
-      </imageobject>
-    <imageobject role="fo">
+      <imageobject>
 	<imagedata align="center" fileref="../../articles/en/images/ebm_primitive_fig02.png" format="PNG"/>
      </imageobject>
    </mediaobject>
@@ -50,10 +46,7 @@
  <figure xml:id="ebm5"><info><title>Example of the ebm with projection shader added.</title></info>

    <mediaobject>
-      <imageobject role="html">
-	<imagedata align="center" fileref="../../articles/en/images/ebm_primitive_fig03.png" format="PNG"/>
-      </imageobject>
-    <imageobject role="fo">
+      <imageobject>
 	<imagedata align="center" fileref="../../articles/en/images/ebm_primitive_fig03.png" format="PNG"/>
      </imageobject>
    </mediaobject>
@@ -1,4 +1,8 @@
-<article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0">
+<!-- Converted by db4-upgrade version 1.0 -->
+
+<article xmlns="http://docbook.org/ns/docbook" version="5.0"
+	 xmlns:xi="http://www.w3.org/2001/XInclude"
+>
  <info><title>Setting Up a .mgedrc File</title>


@@ -59,10 +63,7 @@
    after header.</title></info>

    <mediaobject>
-      <imageobject role="html">
-	<imagedata align="center" fileref="../../articles/en/images/mgedrc_fig01.png" format="PNG"/>
-      </imageobject>
-    <imageobject role="fo">
+      <imageobject>
 	<imagedata align="center" fileref="../../articles/en/images/mgedrc_fig01.png" format="PNG"/>
      </imageobject>
    </mediaobject>
@@ -204,10 +205,7 @@ proc cps {oldprim newprim} {cp $oldprim $newprim; sed $newprim}
  <figure xml:id="mgedrc13"><info><title>Sample elements and functionality of a .mgedrc file.</title></info>

    <mediaobject>
-      <imageobject role="html">
-	<imagedata align="center" fileref="../../articles/en/images/mgedrc_fig02.png" format="PNG"/>
-      </imageobject>
-    <imageobject role="fo">
+      <imageobject>
 	<imagedata align="center" fileref="../../articles/en/images/mgedrc_fig02.png" format="PNG"/>
      </imageobject>
    </mediaobject>
@@ -259,10 +257,7 @@ proc cps {oldprim newprim} {cp $oldprim $newprim; sed $newprim}
  <figure xml:id="mgedrc16"><info><title>Sample window dimension input and positioning.</title></info>

    <mediaobject>
-      <imageobject role="html">
-	<imagedata align="center" fileref="../../articles/en/images/mgedrc_fig03.png" format="PNG"/>
-      </imageobject>
-    <imageobject role="fo">
+      <imageobject>
 	<imagedata align="center" fileref="../../articles/en/images/mgedrc_fig03.png" format="PNG"/>
      </imageobject>
    </mediaobject>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Interactive Raytracing: The <command>nirt</command> Command</title>

@@ -96,10 +98,7 @@ Options:
      <para>
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig01.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig01.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -552,10 +551,7 @@ mged&gt;

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig02.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig02.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -570,10 +566,7 @@ mged&gt;

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig03.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig03.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -627,10 +620,7 @@ mged&gt;

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig04.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig04.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -661,10 +651,7 @@ mged&gt; ae 90 0

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig05.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig05.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -721,10 +708,7 @@ mged&gt; ae 90 0

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig06.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig06.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -767,10 +751,7 @@ mged&gt; ae 90 0

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig07.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig07.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -813,10 +794,7 @@ mged&gt; ae 90 0

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig08.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig08.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -848,10 +826,7 @@ mged&gt; ae 90 0

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig09.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig09.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -890,10 +865,7 @@ mged&gt;

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig10.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig10.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -981,10 +953,7 @@ right_cube.r         (    2.000    -1.000     0.000)     2.00    0.000

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig11.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig11.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1006,10 +975,7 @@ right_cube.r         (    2.000    -1.000     0.000)     2.00    0.000

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig12.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig12.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1029,10 +995,7 @@ right_cube.r         (    2.000    -1.000     0.000)     2.00    0.000

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig13.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig13.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1051,10 +1014,7 @@ right_cube.r         (    2.000    -1.000     0.000)     2.00    0.000

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig14.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig14.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1079,10 +1039,7 @@ right_cube.r         (    2.000    -1.000     0.000)     2.00    0.000

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig08.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig08.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1121,10 +1078,7 @@ mged&gt; erase query_rayff00ff

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig15.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig15.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1151,10 +1105,7 @@ mged&gt; who p

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig16.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig16.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1177,10 +1128,7 @@ mged&gt; who p

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig17.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig17.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1235,10 +1183,7 @@ left_cube.r          (   -1.000     0.022     0.011)     2.00    0.000

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig18.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig18.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1320,7 +1265,7 @@ reg_name,path_name,reg_id,x_in,y_in,z_in,d_in,x_out,y_out,z_out,d_out,los,scaled
 	test.csv) and imported into a spreadsheet:

 	<screenshot>
-	  <mediaobject><imageobject role="html"><imagedata align="center" fileref="../../articles/en/images/nirt_fig19.png"/></imageobject><imageobject role="fo"><imagedata align="center" fileref="../../articles/en/images/nirt_fig19.png"/></imageobject></mediaobject>
+	  <mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/nirt_fig19.png"/></imageobject></mediaobject>
 	</screenshot>

      </para>
@@ -1592,10 +1537,7 @@ left_and_right_cubes.r (  -1.0000    0.0000    0.0000)   2.0000   0.0000
 	The Query Ray Control Panel also offers a way to select the Use Air option:
 <informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig20.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig20.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1816,7 +1758,7 @@ reg_name,path_name,reg_id,x_in,y_in,z_in,d_in,x_out,y_out,z_out,d_out,los,scaled
 	As before, this format is trivially imported into a spreadsheet:

 	<screenshot>
-	  <mediaobject><imageobject role="html"><imagedata align="center" fileref="../../articles/en/images/nirt_fig21.png"/></imageobject><imageobject role="fo"><imagedata align="center" fileref="../../articles/en/images/nirt_fig21.png"/></imageobject></mediaobject>
+	  <mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/nirt_fig21.png"/></imageobject></mediaobject>
 	</screenshot>

      </para>
@@ -1911,10 +1853,7 @@ center_cube.r        (   1.0000,   0.0000,   0.0000)   2.0000   0.0000

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig22.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig22.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1956,10 +1895,7 @@ center_cube.r        (   1.0000,   0.0000,   0.0000)   2.0000   0.0000

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig23.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig23.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1980,10 +1916,7 @@ center_cube.r        (   1.0000,   0.0000,   0.0000)   2.0000   0.0000

 	<informalfigure>
 	  <mediaobject>
-	    <imageobject role="html">
-	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig24.png" format="PNG"/>
-	    </imageobject>
-	    <imageobject role="fo">
+	    <imageobject>
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig24.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Object Editing - the <command>oed</command> Command</title>

@@ -53,14 +55,7 @@

    <para>
    <screenshot>
-      <mediaobject>
-        <imageobject role="html">
-          <imagedata align="center" fileref="../../articles/en/images/oed_fig01.png" format="PNG"/>
-        </imageobject>
-        <imageobject role="fo">
-          <imagedata align="center" fileref="../../articles/en/images/oed_fig01.png" format="PNG"/>
-        </imageobject>
-      </mediaobject>
+      <mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig01.png"/></imageobject></mediaobject>
    </screenshot>
    </para>

@@ -207,14 +202,7 @@ lollipop/

    <para>
      <screenshot>
-	<mediaobject>
-          <imageobject role="html">
-             <imagedata align="center" fileref="../../articles/en/images/oed_fig02.png" format="PNG"/>
-          </imageobject>
-          <imageobject role="fo">
-             <imagedata align="center" fileref="../../articles/en/images/oed_fig02.png" format="PNG"/>
-          </imageobject>
-        </mediaobject>
+	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig02.png"/></imageobject></mediaobject>
      </screenshot>
    </para>

@@ -277,14 +265,7 @@ cube.s:  ARB8

    <para>
      <screenshot>
-	<mediaobject>
-          <imageobject role="html">
-            <imagedata align="center" fileref="../../articles/en/images/oed_fig03.png" format="PNG"/>
-          </imageobject>
-          <imageobject role="fo">
-            <imagedata align="center" fileref="../../articles/en/images/oed_fig03.png" format="PNG"/>
-          </imageobject>
-        </mediaobject>
+	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig03.png"/></imageobject></mediaobject>
      </screenshot>
    </para>

@@ -297,14 +278,7 @@ cube.s:  ARB8

    <para>
      <screenshot>
-	<mediaobject>
-          <imageobject role="html">
-            <imagedata align="center" fileref="../../articles/en/images/oed_fig04.png" format="PNG"/>
-          </imageobject>
-          <imageobject role="fo">
-            <imagedata align="center" fileref="../../articles/en/images/oed_fig04.png" format="PNG"/>
-          </imageobject>
-        </mediaobject>
+	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig04.png"/></imageobject></mediaobject>
      </screenshot>
    </para>

@@ -316,14 +290,7 @@ cube.s:  ARB8

    <para>
      <screenshot>
-	<mediaobject>
-          <imageobject role="html">
-            <imagedata align="center" fileref="../../articles/en/images/oed_fig05.png" format="PNG"/>
-          </imageobject>
-          <imageobject role="fo">
-            <imagedata align="center" fileref="../../articles/en/images/oed_fig05.png" format="PNG"/>
-          </imageobject>
-        </mediaobject>
+	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig05.png"/></imageobject></mediaobject>
      </screenshot>
    </para>

@@ -374,14 +341,7 @@ cube.s:  ARB8

    <para>
      <screenshot>
-	<mediaobject>
-          <imageobject role="html">
-            <imagedata align="center" fileref="../../articles/en/images/oed_fig06.png" format="PNG"/>
-          </imageobject>
-          <imageobject role="fo">
-            <imagedata align="center" fileref="../../articles/en/images/oed_fig06.png" format="PNG"/>
-          </imageobject>
-        </mediaobject>
+	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig06.png"/></imageobject></mediaobject>
      </screenshot>
    </para>

@@ -509,14 +469,7 @@ cube.s:  ARB8

    <para>
      <screenshot>
-	<mediaobject>
-          <imageobject role="html">
-            <imagedata align="center" fileref="../../articles/en/images/oed_fig07.png" format="PNG"/>
-          </imageobject>
-          <imageobject role="fo">
-            <imagedata align="center" fileref="../../articles/en/images/oed_fig07.png" format="PNG"/>
-          </imageobject>
-        </mediaobject>
+	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig07.png"/></imageobject></mediaobject>
      </screenshot>
    </para>

@@ -557,14 +510,7 @@ cube.s:  ARB8

    <para>
      <screenshot>
-	<mediaobject>
-          <imageobject role="html">
-            <imagedata align="center" fileref="../../articles/en/images/oed_fig08.png" format="PNG"/>
-          </imageobject>
-          <imageobject role="fo">
-            <imagedata align="center" fileref="../../articles/en/images/oed_fig08.png" format="PNG"/>
-          </imageobject>
-        </mediaobject>
+	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig08.png"/></imageobject></mediaobject>
      </screenshot>
    </para>

@@ -636,14 +582,7 @@ object2.c:  --
    <literallayout class="monospaced">accept</literallayout>

    <screenshot>
-      <mediaobject>
-        <imageobject role="html">
-          <imagedata align="center" fileref="../../articles/en/images/oed_fig09.png" format="PNG"/>
-        </imageobject>
-        <imageobject role="fo">
-          <imagedata align="center" fileref="../../articles/en/images/oed_fig09.png" format="PNG"/>
-        </imageobject>
-      </mediaobject>
+      <mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig09.png"/></imageobject></mediaobject>
    </screenshot>

    <literallayout class="monospaced">
@@ -680,14 +619,7 @@ object2.c:  --

    <para>
      <screenshot>
-	<mediaobject>
-          <imageobject role="html">
-            <imagedata align="center" fileref="../../articles/en/images/oed_fig10.png" format="PNG"/>
-          </imageobject>
-          <imageobject role="fo">
-            <imagedata align="center" fileref="../../articles/en/images/oed_fig10.png" format="PNG"/>
-          </imageobject>
-        </mediaobject>
+	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig10.png"/></imageobject></mediaobject>
      </screenshot>
    </para>

@@ -737,14 +669,7 @@ object1.c:  --

    <para>
      <screenshot>
-	<mediaobject>
-          <imageobject role="html">
-            <imagedata align="center" fileref="../../articles/en/images/oed_fig11.png" format="PNG"/>
-          </imageobject>
-          <imageobject role="fo">
-            <imagedata align="center" fileref="../../articles/en/images/oed_fig11.png" format="PNG"/>
-          </imageobject>
-        </mediaobject>
+	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig11.png"/></imageobject></mediaobject>
      </screenshot>
    </para>

@@ -759,14 +684,7 @@ object1.c:  --

    <para>
      <screenshot>
-	<mediaobject>
-          <imageobject role="html">
-            <imagedata align="center" fileref="../../articles/en/images/oed_fig12.png" format="PNG"/>
-          </imageobject>
-          <imageobject role="fo">
-            <imagedata align="center" fileref="../../articles/en/images/oed_fig12.png" format="PNG"/>
-          </imageobject>
-        </mediaobject>
+	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig12.png"/></imageobject></mediaobject>
      </screenshot>
    </para>

@@ -832,14 +750,7 @@ object1.c:  --
    <literallayout class="monospaced">B bigobject.r</literallayout>

    <screenshot>
-      <mediaobject>
-        <imageobject role="html">
-          <imagedata align="center" fileref="../../articles/en/images/oed_fig13.png" format="PNG"/>
-        </imageobject>
-        <imageobject role="fo">
-          <imagedata align="center" fileref="../../articles/en/images/oed_fig13.png" format="PNG"/>
-        </imageobject>
-      </mediaobject>
+      <mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig13.png"/></imageobject></mediaobject>
    </screenshot>
    </para>

@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Using the Pipe Primitive</title>

@@ -78,10 +80,7 @@
    <figure><info><title>Basic pipe with parameters.</title></info>

      <mediaobject>
-	<imageobject role="html">
-	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig01.png" format="PNG"/>
-	</imageobject>
-	<imageobject role="fo">
+	<imageobject>
 	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig01.png" format="PNG"/>
 	</imageobject>
      </mediaobject>
@@ -90,10 +89,7 @@
    <figure><info><title>Various bend radii.</title></info>

      <mediaobject>
-	<imageobject role="html">
-	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig02.png" format="PNG"/>
-	</imageobject>
-	<imageobject role="fo">
+	<imageobject>
 	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig02.png" format="PNG"/>
 	</imageobject>
      </mediaobject>
@@ -102,10 +98,7 @@
    <figure><info><title>Example of special uses of the pipe.</title></info>

      <mediaobject>
-	<imageobject role="html">
-	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig03.png" format="PNG"/>
-	</imageobject>
-	<imageobject role="fo">
+	<imageobject>
 	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig03.png" format="PNG"/>
 	</imageobject>
      </mediaobject>
@@ -188,10 +181,7 @@
    <figure><info><title>Determining the point positions for the copper coil.</title></info>

      <mediaobject>
-	<imageobject role="html">
-	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig04.png" format="PNG"/>
-	</imageobject>
-	<imageobject role="fo">
+	<imageobject>
 	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig04.png" format="PNG"/>
 	</imageobject>
      </mediaobject>
@@ -297,35 +287,35 @@
 	<tbody>
 	  <row>
 	    <entry>- mged&gt;p 500 -500 150</entry>
-	    <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../articles/en/images/pipes_fig05.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../articles/en/images/pipes_fig05.png"/></imageobject></inlinemediaobject></entry>
+	    <entry><inlinemediaobject><imageobject><imagedata fileref="../../articles/en/images/pipes_fig05.png"/></imageobject></inlinemediaobject></entry>
 	  </row>
 	  <row>
 	    <entry>- mged&gt;p -500 -500 250</entry>
-	    <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../articles/en/images/pipes_fig06.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../articles/en/images/pipes_fig06.png"/></imageobject></inlinemediaobject></entry>
+	    <entry><inlinemediaobject><imageobject><imagedata fileref="../../articles/en/images/pipes_fig06.png"/></imageobject></inlinemediaobject></entry>
 	  </row>
 	  <row>
 	    <entry>- mged&gt;p -500 500 350</entry>
-	    <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../articles/en/images/pipes_fig07.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../articles/en/images/pipes_fig07.png"/></imageobject></inlinemediaobject></entry>
+	    <entry><inlinemediaobject><imageobject><imagedata fileref="../../articles/en/images/pipes_fig07.png"/></imageobject></inlinemediaobject></entry>
 	  </row>
 	  <row>
 	    <entry>- mged&gt;p 500 500 450</entry>
-	    <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../articles/en/images/pipes_fig08.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../articles/en/images/pipes_fig08.png"/></imageobject></inlinemediaobject></entry>
+	    <entry><inlinemediaobject><imageobject><imagedata fileref="../../articles/en/images/pipes_fig08.png"/></imageobject></inlinemediaobject></entry>
 	  </row>
 	  <row>
 	    <entry>- mged&gt;p 500 -500 550</entry>
-	    <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../articles/en/images/pipes_fig09.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../articles/en/images/pipes_fig09.png"/></imageobject></inlinemediaobject></entry>
+	    <entry><inlinemediaobject><imageobject><imagedata fileref="../../articles/en/images/pipes_fig09.png"/></imageobject></inlinemediaobject></entry>
 	  </row>
 	  <row>
 	    <entry>- mged&gt;p -500 -500 650</entry>
-	    <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../articles/en/images/pipes_fig10.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../articles/en/images/pipes_fig10.png"/></imageobject></inlinemediaobject></entry>
+	    <entry><inlinemediaobject><imageobject><imagedata fileref="../../articles/en/images/pipes_fig10.png"/></imageobject></inlinemediaobject></entry>
 	  </row>
 	  <row>
 	    <entry>- mged&gt;p -500 500 750</entry>
-	    <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../articles/en/images/pipes_fig11.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../articles/en/images/pipes_fig11.png"/></imageobject></inlinemediaobject></entry>
+	    <entry><inlinemediaobject><imageobject><imagedata fileref="../../articles/en/images/pipes_fig11.png"/></imageobject></inlinemediaobject></entry>
 	  </row>
 	  <row>
 	    <entry>- mged&gt;p 0 500 800</entry>
-	    <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../articles/en/images/pipes_fig12.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../articles/en/images/pipes_fig12.png"/></imageobject></inlinemediaobject></entry>
+	    <entry><inlinemediaobject><imageobject><imagedata fileref="../../articles/en/images/pipes_fig12.png"/></imageobject></inlinemediaobject></entry>
 	  </row>
 	</tbody>
      </tgroup>
@@ -338,10 +328,7 @@
    <figure><info><title>Raytraced coil segment.</title></info>

      <mediaobject>
-	<imageobject role="html">
-	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig13.png" format="PNG"/>
-	</imageobject>
-	<imageobject role="fo">
+	<imageobject>
 	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig13.png" format="PNG"/>
 	</imageobject>
      </mediaobject>
@@ -1,4 +1,8 @@
-<article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0">
+<!-- Converted by db4-upgrade version 1.0 -->
+
+<article xmlns="http://docbook.org/ns/docbook" version="5.0"
+	 xmlns:xi="http://www.w3.org/2001/XInclude"
+>
  <info><title>Using the Projection Shader</title>


@@ -25,10 +29,7 @@
    <figure><info><title>The many components of a circuit board.</title></info>

      <mediaobject>
-	<imageobject role="html">
-	  <imagedata align="center" fileref="../../articles/en/images/projection_shader_fig01.png" format="PNG"/>
-	</imageobject>
-      <imageobject role="fo">
+	<imageobject>
 	  <imagedata align="center" fileref="../../articles/en/images/projection_shader_fig01.png" format="PNG"/>
 	</imageobject>
      </mediaobject>
@@ -171,10 +172,7 @@
    <figure><info><title>Using the Raytrace Control Panel to size the graphics window.</title></info>

      <mediaobject>
-	<imageobject role="html">
-	  <imagedata align="center" fileref="../../articles/en/images/projection_shader_fig02.png" format="PNG"/>
-	</imageobject>
-      <imageobject role="fo">
+	<imageobject>
 	  <imagedata align="center" fileref="../../articles/en/images/projection_shader_fig02.png" format="PNG"/>
 	</imageobject>
      </mediaobject>
@@ -303,10 +301,7 @@ Diagrammed, this command breaks down as follows:
    <figure><info><title>Fitting the geometry view to the image dimensions.</title></info>

      <mediaobject>
-	<imageobject role="html">
-	  <imagedata align="center" fileref="../../articles/en/images/projection_shader_fig03.png" format="PNG"/>
-	</imageobject>
-      <imageobject role="fo">
+	<imageobject>
 	  <imagedata align="center" fileref="../../articles/en/images/projection_shader_fig03.png" format="PNG"/>
 	</imageobject>
      </mediaobject>
@@ -344,10 +339,7 @@ Diagrammed, this command breaks down as follows:
    <figure><info><title>Applying the shader settings with the combination editor.</title></info>

      <mediaobject>
-	<imageobject role="html">
-	  <imagedata align="center" fileref="../../articles/en/images/projection_shader_fig04.png" format="PNG"/>
-	</imageobject>
-      <imageobject role="fo">
+	<imageobject>
 	  <imagedata align="center" fileref="../../articles/en/images/projection_shader_fig04.png" format="PNG"/>
 	</imageobject>
      </mediaobject>
@@ -356,10 +348,7 @@ Diagrammed, this command breaks down as follows:
    <figure><info><title>Original image (left) and image with circular cutouts (right).</title></info>

      <mediaobject>
-	<imageobject role="html">
-	  <imagedata align="center" fileref="../../articles/en/images/projection_shader_fig05.png" format="PNG"/>
-	</imageobject>
-      <imageobject role="fo">
+	<imageobject>
 	  <imagedata align="center" fileref="../../articles/en/images/projection_shader_fig05.png" format="PNG"/>
 	</imageobject>
      </mediaobject>
@@ -384,10 +373,7 @@ prj_add circuitboard.prj circuit_front_950.pix 950 950
    <figure><info><title>The projection shader applied to the front of the circuit board.</title></info>

      <mediaobject>
-	<imageobject role="html">
-	  <imagedata align="center" fileref="../../articles/en/images/projection_shader_fig06.png" format="PNG"/>
-	</imageobject>
-      <imageobject role="fo">
+	<imageobject>
 	  <imagedata align="center" fileref="../../articles/en/images/projection_shader_fig06.png" format="PNG"/>
 	</imageobject>
      </mediaobject>
@@ -400,10 +386,7 @@ prj_add circuitboard.prj circuit_front_950.pix 950 950
    <figure><info><title>The circuit board .prj file.</title></info>

      <mediaobject>
-	<imageobject role="html">
-	  <imagedata align="center" fileref="../../articles/en/images/projection_shader_fig07.png" format="PNG"/>
-	</imageobject>
-      <imageobject role="fo">
+	<imageobject>
 	  <imagedata align="center" fileref="../../articles/en/images/projection_shader_fig07.png" format="PNG"/>
 	</imageobject>
      </mediaobject>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Vehicle Tire and Wheel Creation in BRL-CAD</title>

@@ -51,10 +53,7 @@

    <informalfigure>
      <mediaobject>
-	<imageobject role="html">
-	  <imagedata align="center" fileref="../../articles/en/images/tire_fig01.png" format="PNG"/>
-	</imageobject>
-	<imageobject role="fo">
+	<imageobject>
 	  <imagedata align="center" fileref="../../articles/en/images/tire_fig01.png" format="PNG"/>
 	</imageobject>
 	<caption>
@@ -173,10 +172,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../articles/en/images/tire_fig02.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig02.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -201,10 +197,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../articles/en/images/tire_fig03.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig03.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -283,10 +276,7 @@
    <para>
      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../articles/en/images/tire_fig04.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig04.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -306,10 +296,7 @@
    <para>
      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../articles/en/images/tire_fig05.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig05.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -333,10 +320,7 @@
    <para>
      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../articles/en/images/tire_fig06.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig06.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -363,10 +347,7 @@
    <para>
      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../articles/en/images/tire_fig07.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig07.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -391,10 +372,7 @@
    <para>
      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../articles/en/images/tire_fig08.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig08.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -450,10 +428,7 @@
    <para>
      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../articles/en/images/tire_fig09.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig09.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -474,10 +449,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../articles/en/images/tire_fig10.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig10.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -503,10 +475,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../articles/en/images/tire_fig11.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig11.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -534,10 +503,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../articles/en/images/tire_fig12.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig12.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -562,10 +528,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../articles/en/images/tire_fig13.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig13.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -622,10 +585,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../articles/en/images/tire_fig14.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig14.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <book xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title><application>BRL-CAD</application> Tutorial Series: Volume I - An Overview of BRL-CAD</title>

@@ -233,7 +235,7 @@
 	</listitem>
 	<listitem>
 	  <para>
-		Programs for manipulating images and converting between different image file types. The two primary BRL-CAD types are pix (24-bit red, green, and blue [RGB] color images) and bw (8-bit grayscale images). Converters exist for various image formats including alias, png, ppm, etc.
+		Programs for manipulating images and converting between different image file types. The two primary BRL-CAD types are pix (24-bit red, green, and blue [RGB] color images) and bw (8-bit greyscale images). Converters exist for various image formats including alias, png, ppm, etc.
 	  </para>
 	</listitem>
 	<listitem>
@@ -376,7 +378,7 @@

  </chapter>

-  <chapter xml:id="acknowledgments"><info><title>Acknowledgments</title></info>
+  <chapter xml:id="acknowledgements"><info><title>Acknowledgements</title></info>

 	<para>
 	The authors would like to thank the members of the Advanced Computer Systems Team, who reviewed this document in a timely manner and made many helpful suggestions to improve its accuracy and presentation. At the time this document was prepared team members included John Anderson, TraNese Christy, Bob Parker, Ron Bowers, and Sean Morrison.
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <book xmlns="http://docbook.org/ns/docbook" version="5.0"
      xmlns:xi="http://www.w3.org/2001/XInclude"
 >
@@ -66,7 +68,7 @@
    </para>
  </preface>

-  <preface><info><title>Acknowledgments</title></info>
+  <preface><info><title>Acknowledgements</title></info>

    <para>
      The authors would like to thank Paul Tanenbaum, TraNese Christy, Sean
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <book xmlns="http://docbook.org/ns/docbook" version="5.0"
      xmlns:xi="http://www.w3.org/2001/XInclude"
 >
@@ -29,7 +31,7 @@

  </info>

-  <preface><info><title>Acknowledgments</title></info>
+  <preface><info><title>Acknowledgements</title></info>


    <para>
@@ -521,7 +523,7 @@
       smaller, more manageable pieces. Also, this step can often reveal a
       logical building order (e.g., the drywall does not get installed until the
       wiring inside the walls has been run) as well as identify important
-       interconnections among parts.
+       interconnectivities among parts.
     </para>
     <para>
       The following list provides some tips to achieve good model structuring:
@@ -1581,7 +1583,7 @@ mvall oldname newname
 	    model.
 	  </para>
 	  <para>
-	    As shown in Table 7, there are trade-offs to be considered when using each
+	    As shown in Table 7, there are tradeoffs to be considered when using each
 	    of these approaches. Construction effort is one of them. If the prototype
 	    consists of many objects or layers of structure, replication could be a
 	    tedious task. In the box of pencils, for example, all of the structure of
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <book xmlns="http://docbook.org/ns/docbook" version="5.0">

  <info>
@@ -39,7 +41,7 @@ dedicated to his memory.</para>
    </formalpara>
  </dedication>
  <!--  <preface>
-  <title>Acknowledgments</title>
+  <title>Acknowledgements</title>
  <para>The authors would like to thank Messrs. Lee Butler, Edwin Davisson, William
  Landis, and David Davis for technically reviewing this document in a timely
  manner and for making numerous suggestions to improve its content and
@@ -148,10 +150,7 @@ Engineering Company, 2002):</para>
 	<figure xml:id="fig_die_extrusion"><info><title>CSG and BREP approaches to representing an extrusion die (Tanenbaum, 2001).</title></info>

 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata fileref="foo.eps" format="EPS"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata fileref="foo.eps" format="EPS"/>
 	  </imageobject>
 	  <textobject>
@@ -165,14 +164,14 @@ Engineering Company, 2002):</para>
 	<para>Because most commercial CAD systems have the capability to produce tessellated approximations of their BREP objects, some converters to BRL-CAD (e.g., those with Pro/E and Unigraphics) take advantage of these capabilities. In addition, the previously mentioned STL format, which represents solid objects entirely with triangles, offers the community a universal (albeit crude) way to convert BRL-CAD geometry (via the <command>g-stl</command> converter) to nearly any commercial CAD system.</para>
 	<figure xml:id="fig_bot"><info><title>Approximating a smooth, curved surface (left) with a BOT (right) (Tanenbaum, 2001).</title></info>

-	  <mediaobject><imageobject role="html"><imagedata fileref="test_img.eps" format="EPS"/></imageobject><imageobject role="fo"><imagedata fileref="test_img.eps" format="EPS"/></imageobject></mediaobject>
+	  <mediaobject><imageobject><imagedata fileref="test_img.eps" format="EPS"/></imageobject></mediaobject>
 	</figure>
 	<table><title>BREP Terminology</title>

 	  <tgroup cols="2">
 	    <tbody>
 	      <row>
-		<entry><mediaobject><imageobject role="html"><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject><imageobject role="fo"><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject></mediaobject></entry>
+		<entry><mediaobject><imageobject><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject></mediaobject></entry>
 		<entry>
 <para>BREP Terminology</para>
 <para>Boundary representations can take several forms. Although the terms for these forms are sometimes used interchangeably, the following list provides some key distinctions:</para>
@@ -202,7 +201,7 @@ Engineering Company, 2002):</para>
 	<tgroup cols="2">
 	  <tbody>
 	    <row>
-	      <entry><mediaobject><imageobject role="html"><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject><imageobject role="fo"><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject></mediaobject></entry>
+	      <entry><mediaobject><imageobject><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject></mediaobject></entry>

 	      <entry><para>CSG or BREP?</para><para>Depending on one's point of view, there are advantages and disadvantages to using CSG vs. BREP. Although "the right" approach for a given project ultimately depends on many specifics (e.g., model purpose, hardware/software availability, and compatibility with other users), the following areas should be considered when choosing between CSG and BREP:</para><itemizedlist>
 		  <listitem>
@@ -230,7 +229,7 @@ Engineering Company, 2002):</para>
 	<tgroup cols="2">
 	  <tbody>
 	    <row>
-	      <entry><mediaobject><imageobject role="html"><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject><imageobject role="fo"><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject></mediaobject></entry>
+	      <entry><mediaobject><imageobject><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject></mediaobject></entry>
 	      <entry><para>What About Databases in the Old Format?</para><para>Although databases created with BRL-CAD release 6.0 or later are in the new format by default, BRL-CAD retains the ability to work in the old format. Thus, new-database users need not be concerned about losing databases in the old format. Also, whenever a new database format is implemented in the future (typically a rare event), the dbupgrade utility will be modified so that it will always be able to upgrade databases to the current format.</para></entry>
 	    </row>
 	  </tbody>
@@ -450,7 +449,7 @@ Engineering Company, 2002):</para>
 	<tgroup cols="2">
 	  <tbody>
 	    <row>
-	      <entry><mediaobject><imageobject role="html"><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject><imageobject role="fo"><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject></mediaobject></entry>
+	      <entry><mediaobject><imageobject><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject></mediaobject></entry>
 	      <entry><para>The NMG primitive represents geometry that is defined by points, lines, polygonal facets, and collections thereof. It is the primary BRL-CAD primitive for encoding one- or two-dimensional (2-D) data. For more information on the NMG, see Muuss and Butler (1991) and Weiler (1987).</para></entry>
 	    </row>
 	  </tbody>
@@ -527,7 +526,7 @@ Engineering Company, 2002):</para>
    </section>
    <section><info><title>Converting From EUCLID Format</title></info>

-      <para>EUCLID is one of Europe's primary product design, manufacturing, and engineering CAD packages (though it is quickly being superseded by CATIA). Formerly distributed by the European Aeronautic Defence and Space Company's Matra Datavision subsidiary and now a product of the IBM subsidiary MDTVISION, the package was developed for the design and manufacture of complex models and has been used on major systems such as the Airbus, Eurocopter, Ariane, Eurofighter, Astrium, and Euromissile.</para>
+      <para>EUCLID is one of Europe's primary product design, manufacturing, and engineering CAD packages (though it is quickly being superceded by CATIA). Formerly distributed by the European Aeronautic Defence and Space Company's Matra Datavision subsidiary and now a product of the IBM subsidiary MDTVISION, the package was developed for the design and manufacture of complex models and has been used on major systems such as the Airbus, Eurocopter, Ariane, Eurofighter, Astrium, and Euromissile.</para>
      <para>Package features include specialized applications for design, styling, drafting, analysis, machining, and product data management. Recent enhancements have focused on automatic creation of 2-D drawings from 3-D models, milling cycles, two- to four-axis wire cutting, sheet metal design, mold design, and standard data exchange format interfaces.</para>
      <para>EUCLID offers several data translation interfaces, including those for DXF, IGES, VDA-FS, STL, and SET formats. In addition, other modules are available to help refine and customize data transfer, with direct connectivity at two levels available for CATIA (V4/V5) data transfer using BREPs to handle surface data. EUCLID geometry can be output to standard graphic (e.g., PostScript, Encapsulated PostScript, and Interleaf) and plotting (e.g., CalComp, HP, HP/GL2, OCE, and Versatec) formats as well as to an STL file.</para>
      <para>The <command>euclid-g</command> converter converts an ASCII EUCLID ``decoded'' format file to BRL-CAD. Each part is converted to a BRL-CAD region consisting of a single BOT primitive.</para>
@@ -563,7 +562,7 @@ Engineering Company, 2002):</para>
 	<tgroup cols="2">
 	  <tbody>
 	    <row>
-	      <entry><mediaobject><imageobject role="html"><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject><imageobject role="fo"><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject></mediaobject></entry>
+	      <entry><mediaobject><imageobject><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject></mediaobject></entry>
 	      <entry><para>Note that all header (.h) files-including <filename>raytrace.h</filename>, <filename>nmg.h</filename>, and <filename>bu.h</filename> - are accessible in both the source and binary distributions of BRL-CAD. In the binary distribution, these files are installed in the <!-- bch "user"? --><filename>/user/brlcad/include/brlcad</filename> directory.</para></entry>
 	    </row>
 	  </tbody>
@@ -764,14 +763,14 @@ Engineering Company, 2002):</para>
      <para>Accordingly, in order to use the converter, the user must have a seat of Pro/E as well as the BRL-CAD distribution. Currently, the converter is only supported on <orgname>Silicon Graphics (SGI)</orgname> machines with MIPS processors running the Irix operating system. The source code for this converter is included in the binary distribution, so users can compile it for different platforms if they have the Pro/Toolkit module for that platform.</para>
      <para>Pro/E models are made up of two elements: parts and assemblies. Part files (which are designated by a <filename>.prt</filename> extension) are the basic building blocks of Pro/E geometry. Assembly files (which are designated by a <filename>.asm</filename> extension) are composed of parts and/or other assemblies. The converter produces a BRL-CAD region for each Pro/E part that is converted and a BRL- CAD combination for each Pro/E assembly that is converted. Each of these regions will consist of a single BOT primitive.</para>
      <para>The conversion of geometry from Pro/E to BRL-CAD is a two-stage process. This converter first produces the ASCII form of BRL-CAD databases. The user then converts these databases to binary form using the <command>asc2g</command> utility.</para>
-      <para>In addition, because Pro/E files for most vehicles are so large (often several GBs in size), entire geometries typically cannot be loaded all at once. Thus, the BRL-CAD user often has to convert geometry system by system (e.g., engine, transmission, and suspension) and then concatenate (i.e., join) them together in a single BRL-CAD geometry file. For more detailed information about this process, see the discussion on dbconcat in Volume III of this tutorial series.</para>
+      <para>In addition, because Pro/E files for most combat vehicles are so large (often requiring a stack of CDs to store them), entire geometries typically cannot be loaded all at once. Thus, the BRL-CAD user often has to convert geometry system by system (e.g., engine, transmission, and suspension) and then concatenate (i.e., join) them together in a single BRL-CAD geometry file. For more detailed information about this process, see the discussion on dbconcat in Volume III of this tutorial series.</para>
      <para>Pro/E makes extensive use of referenced geometry. As discussed in the previous volume of this tutorial series (see section 5 of Butler et al. [2003]), referencing is the method by which multiple occurrences of objects are created by referring to a single object numerous times with different orientations and locations for each reference. These references are duplicated in BRL-CAD using combinations and transformation matrices. In some cases-such as when geometry is used with vulnerability codes that require each region to have a unique ident number-users may need to use the <command>xpush</command> command in MGED after the conversion is complete to replace the references with real geometry. For more information about this procedure, users should consult MGED's on-line help or the <command>xpush</command> entry in volume II of this tutorial series (see appendix A of Butler et al. [2001]).</para>
      <table><title>Keys to Converting Pro/E Geometry</title>

 	<tgroup cols="2">
 	  <tbody>
 	    <row>
-	      <entry><mediaobject><imageobject role="html"><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject><imageobject role="fo"><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject></mediaobject></entry>
+	      <entry><mediaobject><imageobject><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject></mediaobject></entry>
 	      <entry><para>To maximize the efficiency and effectiveness of converting Pro/E geometry, the BRL-CAD user should first acquire the following information from the Pro/E designer: A list of top-level assemblies - This information is vital in helping the BRL-CAD user gain an understanding of the overall model structure and know where to begin the conversion process. A mapping of part numbers to part names - Although part numbers can be an important aspect of design and manufacturing, they have little meaning for vulnerability analysts, who are more concerned with the descriptive names of the components than the numbers represent.</para></entry>
 	    </row>
 	  </tbody>
@@ -781,7 +780,7 @@ Engineering Company, 2002):</para>
      <para>The conversion process is started by selecting the <guimenuitem>ProE-BRL</guimenuitem> item in the Pro/E drop-down <guimenu>File</guimenu> menu. The converter dialog box, shown in <xref linkend="fig_converter_dialog_box"/>, will then appear.</para>
      <figure xml:id="fig_converter_dialog_box"><info><title>Converter dialog box</title></info>

-	<mediaobject><imageobject role="html"><imagedata fileref="test_img.eps" format="EPS" scale="40"/></imageobject><imageobject role="fo"><imagedata fileref="test_img.eps" format="EPS" scale="40"/></imageobject></mediaobject>
+	<mediaobject><imageobject><imagedata fileref="test_img.eps" format="EPS" scale="40"/></imageobject></mediaobject>
      </figure>
      <para>The following list provides a description of the use and functionality of the primary elements in the dialog box. Note that the box is preloaded with reasonable defaults for many of the inputs. In addition, if the user has a question about any of the entry windows, check boxes, or buttons, he can move the mouse over them to see a brief explanation of their use.</para>
      <itemizedlist>
@@ -1027,7 +1026,7 @@ Engineering Company, 2002):</para>
 	<tgroup cols="2">
 	  <tbody>
 	    <row>
-	      <entry><mediaobject><imageobject role="html"><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject><imageobject role="fo"><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject></mediaobject></entry>
+	      <entry><mediaobject><imageobject><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject></mediaobject></entry>
 	      <entry>Although these packages are often confused, ACAD was developed by <orgname>Lockheed Martin</orgname> and is not connected with AutoCAD, which was developed by <orgname>Autodesk Inc.</orgname></entry>
 	    </row>
 	  </tbody>
@@ -1129,7 +1128,7 @@ Engineering Company, 2002):</para>
 	<tgroup cols="2">
 	  <tbody>
 	    <row>
-	      <entry><mediaobject><imageobject role="html"><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject><imageobject role="fo"><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject></mediaobject></entry>
+	      <entry><mediaobject><imageobject><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject></mediaobject></entry>
 	      <entry>Note that different CAD packages seem to ``prefer'' certain options for the IGES converter. In particular, Pro/E works well with IGES files that use the <option>-m</option> option, and Unigraphics works well with IGES files that use the <option>-s</option> option.</entry>
 	    </row>
 	  </tbody>
@@ -1221,7 +1220,7 @@ Engineering Company, 2002):</para>
 	<tgroup cols="2">
 	  <tbody>
 	    <row>
-	      <entry><mediaobject><imageobject role="html"><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject><imageobject role="fo"><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject></mediaobject></entry>
+	      <entry><mediaobject><imageobject><imagedata fileref="test_img.eps" format="EPS" scale="10"/></imageobject></mediaobject></entry>
 	      <entry><para>The Web3D Consortium is a nonprofit organization promoting open standards for 3-D Web and broadcast applications. Members include leading corporate and educational institutions, including <orgname>3Dlabs</orgname>, <orgname>ATI Technologies</orgname>, <orgname>blaxxun</orgname>, <orgname>Nexternet</orgname>, <orgname>OpenWorlds</orgname>, <orgname>Sony</orgname>, <orgname>SGDL Systems</orgname>, <orgname>ParallelGraphics</orgname>, the Naval Postgraduate School, and the Army Simulation, Training, and Instrumentation Command (STRICOM). Notable efforts include developing VRML specifications and an improved, componentized new-generation specification for Web3D, including X3D (see subsection 5.11) (SURVICE Engineering Company, 2002).</para></entry>
 	    </row>
 	  </tbody>
@@ -113,11 +113,6 @@ endif(CMAKE_CONFIGURATION_TYPES)
 if(BRLCAD_EXTRADOCS_PDF)
  set(targetdir pdf/books/en)
  foreach(filename ${docbook_books_EN})
-    if (EXISTS ${filename})
-      set(full_path_filename ${filename})
-    else (EXISTS ${filename})
-      set(full_path_filename ${CMAKE_CURRENT_SOURCE_DIR}/${filename})
-    endif (EXISTS ${filename})
    string(REGEX REPLACE "([0-9a-z_-]*).xml" "\\1" filename_root "${filename}")
    if(CMAKE_CONFIGURATION_TYPES)
      file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR})
@@ -133,7 +128,7 @@ if(BRLCAD_EXTRADOCS_PDF)
      COMMAND ${CMAKE_COMMAND} -P ${scriptfile}
      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${filename} ${XSLTPROC_EXECUTABLE_TARGET} ${DOCBOOK_RESOURCE_FILES} docbook_books_EN_IMAGES_cp
      )
-    set(outfile ${bin_root}/${DOC_DIR}/${targetdir}/${filename_root}.pdf)
+    set(outfile ${bin_root}/${DATA_DIR}/${DOC_DIR}/${targetdir}/${filename_root}.pdf)
    set(targetname "${filename_root}_book_pdf")
    DB_SCRIPT("${targetname}" "${targetdir}" "${PDF_CONV_EXECUTABLE}")
    add_custom_command(
@@ -147,7 +142,7 @@ if(BRLCAD_EXTRADOCS_PDF)
    if(CMAKE_CONFIGURATION_TYPES)
      string(REPLACE "${CMAKE_CFG_INTDIR}" "\${BUILD_TYPE}" outfile "${outfile}")
    endif(CMAKE_CONFIGURATION_TYPES)
-    install(FILES ${outfile} DESTINATION ${DOC_DIR}/pdf/books/en)
+    install(FILES ${outfile} DESTINATION ${DATA_DIR}/${DOC_DIR}/pdf/books/en)
    get_property(BRLCAD_EXTRADOCS_PDF_TARGETS GLOBAL PROPERTY BRLCAD_EXTRADOCS_PDF_TARGETS)
    set(BRLCAD_EXTRADOCS_PDF_TARGETS ${BRLCAD_EXTRADOCS_PDF_TARGETS} ${targetname})
    set_property(GLOBAL PROPERTY BRLCAD_EXTRADOCS_PDF_TARGETS "${BRLCAD_EXTRADOCS_PDF_TARGETS}")
@@ -156,36 +151,6 @@ endif(BRLCAD_EXTRADOCS_PDF)

 CMAKEFILES(tutorial_series_authors.xml)

-set(hacking_brlcad_images
-   images/hacking_brlcad_article_tire_pdf.png
-   images/hacking_brlcad_bearing_cc.png
-   images/hacking_brlcad_book_vol3_pdf.png
-   images/hacking_brlcad_brlcad_intro_hy.png
-   images/hacking_brlcad_brlcad-wiki.png
-   images/hacking_brlcad_csg.png
-   images/hacking_brlcad_cubit.png
-   images/hacking_brlcad_docbook_CMakeLists.png
-   images/hacking_brlcad_docbook_working_session.png
-   images/hacking_brlcad_doxygen_output.png
-   images/hacking_brlcad_emacs-nxml.png
-   images/hacking_brlcad_example_docbook_default_output.png
-   images/hacking_brlcad_g_spec_pdf.png
-   images/hacking_brlcad_havoc_c.png
-   images/hacking_brlcad_havoc_views_c.png
-   images/hacking_brlcad_M1A1_9x10_300dpi_cc.png
-   images/hacking_brlcad_man_page_search.png
-   images/hacking_brlcad_sflake2_cc.png
-   images/hacking_brlcad_Sgi_cube_cc.png
-   images/hacking_brlcad_stryker_slat.png
-   images/hacking_brlcad_tcl_tk_presentation.png
-   images/hacking_brlcad_teapot.png
-   images/hacking_brlcad_tracked_mine.png
-   images/hacking_brlcad_tutorial_1_pdf.png
-   images/hacking_brlcad_xyz.png
-   )
-CMAKEFILES(${hacking_brlcad_images})
-CMAKEFILES(HACKING_BRL-CAD.xml)
-
 # Local Variables:
 # tab-width: 8
 # mode: cmake
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <info xmlns="http://docbook.org/ns/docbook" version="5.0">
    <authorgroup xml:id="Intro_MGED_Tutorial_Series_II_authors">
      <author><personname><firstname>Lee</firstname><surname>Butler</surname><othername role="mi">A</othername></personname><affiliation>
@@ -1,4 +1,8 @@
-<article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0">
+<!-- Converted by db4-upgrade version 1.0 -->
+
+<article xmlns="http://docbook.org/ns/docbook" version="5.0"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+>
  <info><title>Creating Primitive Shapes in <application>MGED</application></title>


@@ -137,10 +141,22 @@
      <informalfigure>
 	<mediaobject>
 	  <imageobject role="html">
-	    <imagedata align="center" contentwidth="3.9in" scalefit="1" fileref="../../lessons/en/images/mged01_terminal.png" format="PNG"/>
+	    <imagedata
+	       align="center"
+	       contentwidth="3.9in"
+	       scalefit="1"
+	       fileref="../../lessons/en/images/mged01_terminal.png"
+	       format="PNG"
+	     />
 	  </imageobject>
 	  <imageobject role="fo">
-	    <imagedata align="center" width="3.9in" scalefit="1" fileref="../../lessons/en/images/mged01_terminal.png" format="PNG"/>
+	    <imagedata
+	       align="center"
+	       width="3.9in"
+	       scalefit="1"
+	       fileref="../../lessons/en/images/mged01_terminal.png"
+	       format="PNG"
+	     />
 	  </imageobject>


@@ -179,10 +195,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged01_commandwindow.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged01_commandwindow.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -195,10 +208,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged01_graphicswindow.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged01_graphicswindow.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Learning Viewing Options in <application>MGED</application></title>

@@ -107,10 +109,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged02_defaultradio.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged02_defaultradio.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -246,8 +245,8 @@
 	  <tgroup cols="2" align="center">
 	    <tbody>
 	      <row>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged02_flower_zoomin.png" scale="60"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged02_flower_zoomin.png" scale="60"/></imageobject></inlinemediaobject></entry>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged02_flower_zoomout.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged02_flower_zoomout.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged02_flower_zoomin.png" scale="60"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged02_flower_zoomout.png"/></imageobject></inlinemediaobject></entry>
 	      </row>
 	      <row>
 		<entry>Zoom In to View Details (small size of view)</entry>
@@ -341,8 +340,8 @@
 	    <colspec colwidth="3*"/>
 	    <tbody>
 	      <row>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged02_truck_front.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged02_truck_front.png"/></imageobject></inlinemediaobject></entry>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged02_truck_35_0.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged02_truck_35_0.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged02_truck_front.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged02_truck_35_0.png"/></imageobject></inlinemediaobject></entry>
 	      </row>
 	      <row>
 		<entry>Front (az=0, el=0)</entry>
@@ -358,8 +357,8 @@
 	    <colspec colwidth="1*"/>
 	    <tbody>
 	      <row>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged02_truck_left.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged02_truck_left.png"/></imageobject></inlinemediaobject></entry>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged02_truck_rear.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged02_truck_rear.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged02_truck_left.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged02_truck_rear.png"/></imageobject></inlinemediaobject></entry>
 	      </row>
 	      <row>
 		<entry>Left (az=90, el=0)</entry>
@@ -373,7 +372,7 @@
 	  <tgroup cols="1" align="center">
 	    <tbody>
 	      <row>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged02_truck_right.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged02_truck_right.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged02_truck_right.png"/></imageobject></inlinemediaobject></entry>
 	      </row>
 	      <row>
 		<entry>Right (az=270, el=0)</entry>
@@ -398,24 +397,24 @@
 	  <tgroup cols="2" align="center">
 	    <tbody>
 	      <row>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged02_truck_35_0.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged02_truck_35_0.png"/></imageobject></inlinemediaobject></entry>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged02_truck_35_25.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged02_truck_35_25.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged02_truck_35_0.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged02_truck_35_25.png"/></imageobject></inlinemediaobject></entry>
 	      </row>
 	      <row>
 		<entry>az=35, el=0</entry>
 		<entry>az=35, el=25</entry>
 	      </row>
 	      <row>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged02_truck_35_60.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged02_truck_35_60.png"/></imageobject></inlinemediaobject></entry>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged02_truck_35_90.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged02_truck_35_90.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged02_truck_35_60.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged02_truck_35_90.png"/></imageobject></inlinemediaobject></entry>
 	      </row>
 	      <row>
 		<entry>az=35, el=60</entry>
 		<entry>az=35, el=90</entry>
 	      </row>
 	      <row>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged02_truck_270_90.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged02_truck_270_90.png"/></imageobject></inlinemediaobject></entry>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged02_truck_270_-90.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged02_truck_270_-90.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged02_truck_270_90.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged02_truck_270_-90.png"/></imageobject></inlinemediaobject></entry>
 	      </row>
 	      <row>
 		<entry>Top (az=270, el=90)</entry>
@@ -440,7 +439,7 @@
 	    <tgroup cols="1" align="center">
 	      <tbody>
 		<row>
-		  <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged02_truck_0_0_14.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged02_truck_0_0_14.png"/></imageobject></inlinemediaobject></entry>
+		  <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged02_truck_0_0_14.png"/></imageobject></inlinemediaobject></entry>
 		</row>
 		<row>
 		  <entry>Front (az=0, el=0, tw=14)</entry>
@@ -466,10 +465,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged02_coordsys.png" scale="60" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged02_coordsys.png" scale="60" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -507,16 +503,16 @@
 	<tgroup cols="2" align="center">
 	  <tbody>
 	    <row>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged02_radio_top.png" scale="90"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged02_radio_top.png" scale="90"/></imageobject></inlinemediaobject></entry>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged02_radio_35_25.png" scale="90"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged02_radio_35_25.png" scale="90"/></imageobject></inlinemediaobject></entry>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged02_radio_top.png" scale="90"/></imageobject></inlinemediaobject></entry>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged02_radio_35_25.png" scale="90"/></imageobject></inlinemediaobject></entry>
 	    </row>
 	    <row>
 	      <entry>Top</entry>
 	      <entry>az35,el25</entry>
 	    </row>
 	    <row>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged02_radio_right.png" scale="90"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged02_radio_right.png" scale="90"/></imageobject></inlinemediaobject></entry>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged02_radio_front.png" scale="90"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged02_radio_front.png" scale="90"/></imageobject></inlinemediaobject></entry>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged02_radio_right.png" scale="90"/></imageobject></inlinemediaobject></entry>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged02_radio_front.png" scale="90"/></imageobject></inlinemediaobject></entry>
 	    </row>
 	    <row>
 	      <entry>Right</entry>
@@ -544,10 +540,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged02_multipane.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged02_multipane.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Using the Insert Command in <application>MGED</application> to Size and Place Shapes</title>

@@ -79,10 +81,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged03_wireframe_sph.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged03_wireframe_sph.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -111,10 +110,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged03_wireframe_sph_rcc.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged03_wireframe_sph_rcc.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -256,8 +252,8 @@
 	<tgroup cols="2">
 	  <tbody>
 	    <row>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged03_shapes_make_command.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged03_shapes_make_command.png"/></imageobject></inlinemediaobject></entry>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged03_shapes_in_command.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged03_shapes_in_command.png"/></imageobject></inlinemediaobject></entry>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged03_shapes_make_command.png"/></imageobject></inlinemediaobject></entry>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged03_shapes_in_command.png"/></imageobject></inlinemediaobject></entry>
 	    </row>
 	    <row>
 	      <entry>Shapes Created with Make Command</entry>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Assigning Material Properties and Raytracing in <application>MGED</application></title>

@@ -165,10 +167,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged04_commandwindow.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged04_commandwindow.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -282,10 +281,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged04_raytracedshapes.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged04_raytracedshapes.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -337,8 +333,8 @@
 	<tgroup cols="2">
 	  <tbody>
 	    <row>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged04_raytracedshapes.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged04_raytracedshapes.png"/></imageobject></inlinemediaobject></entry>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged04_fb_overlay_mode.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged04_fb_overlay_mode.png"/></imageobject></inlinemediaobject></entry>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged04_raytracedshapes.png"/></imageobject></inlinemediaobject></entry>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged04_fb_overlay_mode.png"/></imageobject></inlinemediaobject></entry>
 	    </row>
 	    <row>
 	      <entry>Framebuffer in Underlay Mode</entry>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Learning About Boolean Expressions</title>

@@ -113,10 +115,7 @@

 	<informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged05_unionspheres.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged05_unionspheres.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -148,10 +147,7 @@

 	<informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged05_subtractionspheres.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged05_subtractionspheres.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -191,10 +187,7 @@

 	<informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged05_intersectionspheres.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged05_intersectionspheres.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -230,10 +223,7 @@

 	<informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged05_twoprimitivespheres.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged05_twoprimitivespheres.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -298,10 +288,7 @@

 	<informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged05_combinationeditor.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged05_combinationeditor.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -342,8 +329,8 @@
 	<tgroup cols="2">
 	  <tbody>
 	    <row>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged05_raytracedpart1.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged05_raytracedpart1.png"/></imageobject></inlinemediaobject></entry>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged05_raytracedpart2.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged05_raytracedpart2.png"/></imageobject></inlinemediaobject></entry>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged05_raytracedpart1.png"/></imageobject></inlinemediaobject></entry>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged05_raytracedpart2.png"/></imageobject></inlinemediaobject></entry>
 	    </row>
 	    <row>
 	      <entry>Raytraced part1.r</entry>
@@ -421,10 +408,7 @@

 	<informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged05_raytracedpart3.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged05_raytracedpart3.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -491,10 +475,7 @@

 	<informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged05_raytraceddome.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged05_raytraceddome.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Creating a Goblet</title>

@@ -39,10 +41,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged06_rtgoblet.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged06_rtgoblet.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -98,10 +97,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged06_gobletbase.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged06_gobletbase.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -133,10 +129,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged06_goblet1stsphere.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged06_goblet1stsphere.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -220,10 +213,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged06_gobletstem.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged06_gobletstem.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -253,10 +243,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged06_gobletbasestembasin.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged06_gobletbasestembasin.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -417,10 +404,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged06_base_subtracted_vol.png" format="PNG"/>
-	  </imageobject>
-	<imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged06_base_subtracted_vol.png" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
@@ -447,10 +431,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged06_rtgobletaz_35_el_25.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged06_rtgobletaz_35_el_25.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Assigning Material Properties to a Goblet</title>

@@ -35,10 +37,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged07_goblet_mater_complete.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged07_goblet_mater_complete.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -159,10 +158,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged07_goblet_complete_window.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged07_goblet_complete_window.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -205,10 +201,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged07_goblet_semitransparent.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged07_goblet_semitransparent.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -241,10 +234,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged07_goblet_mirror.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged07_goblet_mirror.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Assigning More Material Properties to a Goblet</title>

@@ -50,10 +52,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged08_goblet_combeditor.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged08_goblet_combeditor.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -112,10 +111,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged08_spec_vs_diff_reflectivity.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged08_spec_vs_diff_reflectivity.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -173,10 +169,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged08_refractive_index.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged08_refractive_index.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -243,10 +236,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged08_goblet_reflectivity_1.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged08_goblet_reflectivity_1.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -259,10 +249,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged08_goblet_reflectivity_2.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged08_goblet_reflectivity_2.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -282,10 +269,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged08_comb_editor_window_mater_prop.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged08_comb_editor_window_mater_prop.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Creating a Globe in a Display Box</title>

@@ -49,10 +51,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged09_globe_outside_display_box.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged09_globe_outside_display_box.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -74,10 +73,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged09_globe_inside_outside_box.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged09_globe_inside_outside_box.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -120,10 +116,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged09_globe_wireframe.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged09_globe_wireframe.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -199,10 +192,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged09_globe_raytraced.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged09_globe_raytraced.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -302,10 +292,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged09_globe_base_box_wireframe.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged09_globe_base_box_wireframe.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -352,10 +339,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged09_globe_base_box_raytraced.png" format="PNG"/>
-	  </imageobject>
-	<imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged09_globe_base_box_raytraced.png" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Creating a Mug</title>

@@ -336,10 +338,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged10_mug_wireframe.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged10_mug_wireframe.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Refining a Mug Model</title>

@@ -105,10 +107,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged11_mug_raytraced_norim.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged11_mug_raytraced_norim.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -193,10 +192,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged11_mug_raytraced_rim.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged11_mug_raytraced_rim.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Creating a Mug Model using the <application>MGED</application> Interface</title>

@@ -133,10 +135,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged12_cyls_frontview.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged12_cyls_frontview.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -217,8 +216,8 @@
 	  <tgroup cols="2">
 	    <tbody>
 	      <row>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged12_mug_handle_frontview.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged12_mug_handle_frontview.png"/></imageobject></inlinemediaobject></entry>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/en/images/mged12_mug_handle_topview.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged12_mug_handle_topview.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged12_mug_handle_frontview.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged12_mug_handle_topview.png"/></imageobject></inlinemediaobject></entry>
 	      </row>
 	      <row>
 		<entry>Mug and Handle from a Front View</entry>
@@ -249,10 +248,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged12_mug_rim_frontview.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged12_mug_rim_frontview.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -369,10 +365,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged12_mug_gui_finished_raytraced.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged12_mug_gui_finished_raytraced.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Placing Shapes in 3-D Space</title>

@@ -43,10 +45,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged13_candle_design.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged13_candle_design.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -88,10 +87,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged13_candle_tabletop_wireframe_front.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged13_candle_tabletop_wireframe_front.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -132,10 +128,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged13_candle_tabletop_eto1_wireframe_front.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged13_candle_tabletop_eto1_wireframe_front.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -197,10 +190,7 @@ Move End H

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged13_candle_tabletop_eto1_rcc_wireframe_front.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged13_candle_tabletop_eto1_rcc_wireframe_front.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -221,10 +211,7 @@ Move End H

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged13_candle_tabletop_base_front.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged13_candle_tabletop_base_front.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -264,10 +251,7 @@ Move End H

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged13_candle_tabletop_base_candle_front.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged13_candle_tabletop_base_candle_front.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -303,10 +287,7 @@ Move End H

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged13_candle_complete_front.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged13_candle_complete_front.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -425,10 +406,7 @@ Move End H

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged13_candle_comb_ed_checker.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged13_candle_comb_ed_checker.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -494,10 +472,7 @@ Move End H

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged13_candle_raytraced_overlay.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged13_candle_raytraced_overlay.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Additional Exercises Placing Shapes in 3-D Space</title>

@@ -48,10 +50,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged14_candle_base_sphere_topview.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged14_candle_base_sphere_topview.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -86,10 +85,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged14_candle_multipane.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged14_candle_multipane.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -126,10 +122,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged14_primitive_editor.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged14_primitive_editor.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -149,10 +142,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged14_primitive_selection_dropdown.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged14_primitive_selection_dropdown.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -173,14 +163,8 @@
 	  <tgroup cols="2">
 	    <tbody>
 	      <row>
-		<entry><inlinemediaobject>
-                       <imageobject role="html"><imagedata fileref="../../lessons/en/images/mged14_candle_spheres_topview.png"/></imageobject>
-                       <imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged14_candle_spheres_topview.png"/></imageobject>
-                </inlinemediaobject></entry>
-		<entry><inlinemediaobject>
-                       <imageobject role="html"><imagedata fileref="../../lessons/en/images/mged14_candle_spheres_frontview.png"/></imageobject>
-                       <imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged14_candle_spheres_frontview.png"/></imageobject>
-                </inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged14_candle_spheres_topview.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged14_candle_spheres_frontview.png"/></imageobject></inlinemediaobject></entry>
 	      </row>
 	      <row>
 		<entry>Candle from Top View</entry>
@@ -203,10 +187,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged14_candle_spheres_az35el25.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged14_candle_spheres_az35el25.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -534,10 +515,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged14_candle_spheres_raytraced.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged14_candle_spheres_raytraced.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Creating a Toy Truck</title>

@@ -53,10 +55,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged15_truck_design.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged15_truck_design.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -119,10 +118,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged15_truck_cab1s.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged15_truck_cab1s.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -223,10 +219,7 @@ caboff1.s:  ARB8

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged15_truck_cab_cutoff.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged15_truck_cab_cutoff.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -268,10 +261,7 @@ caboff1.s:  ARB8

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged15_truck_multipane_1stwheel.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged15_truck_multipane_1stwheel.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -335,10 +325,7 @@ caboff1.s:  ARB8

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged15_prim_ed_wheel_well.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged15_prim_ed_wheel_well.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -360,10 +347,7 @@ caboff1.s:  ARB8

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged15_truck_2nd_wheel_wheel_place.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged15_truck_2nd_wheel_wheel_place.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -461,10 +445,7 @@ caboff1.s:  ARB8

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged15_truck_cab_body.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged15_truck_cab_body.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -488,10 +469,7 @@ caboff1.s:  ARB8

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged15_truck_wheel_wells_wireframe.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged15_truck_wheel_wells_wireframe.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -588,10 +566,7 @@ caboff1.s:  ARB8

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged15_truck_wheels.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged15_truck_wheels.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -643,10 +618,7 @@ caboff1.s:  ARB8

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged15_cameo_shader.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged15_cameo_shader.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -827,14 +799,8 @@ caboff1.s:  ARB8
 	  <tgroup cols="2" align="center">
 	    <tbody>
 	      <row>
-		<entry><inlinemediaobject>
-                       <imageobject role="html"><imagedata fileref="../../lessons/en/images/mged15_truck_default_lighting.png"/></imageobject>
-                       <imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged15_truck_default_lighting.png"/></imageobject>
-                </inlinemediaobject></entry>
-		<entry><inlinemediaobject>
-                        <imageobject role="html"><imagedata fileref="../../lessons/en/images/mged15_truck_ambient_lighting.png"/></imageobject>
-                        <imageobject role="fo"><imagedata fileref="../../lessons/en/images/mged15_truck_ambient_lighting.png"/></imageobject>
-                 </inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged15_truck_default_lighting.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/en/images/mged15_truck_ambient_lighting.png"/></imageobject></inlinemediaobject></entry>
 	      </row>
 	      <row>
 		<entry>Truck with Default Lighting</entry>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Learning Modeling Techniques and Structures</title>

@@ -42,10 +44,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_new_design.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_new_design.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -149,10 +148,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_default_components_props.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_default_components_props.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -315,10 +311,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_with_mater_props.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_with_mater_props.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -393,10 +386,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_wireframe_circ_board.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_wireframe_circ_board.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -531,10 +521,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_transparent.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_transparent.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -634,10 +621,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_cut_wireframe.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_cut_wireframe.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -656,10 +640,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_cut_raytrace.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_cut_raytrace.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -704,10 +685,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_cutaways.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_cutaways.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -734,10 +712,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_structure_1.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_structure_1.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -755,10 +730,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_structure_2.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_structure_2.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -781,10 +753,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_structure_3.png" format="PNG"/>
-	  </imageobject>
-          <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_structure_3.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -875,10 +844,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_casecut_raytrace.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_casecut_raytrace.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -1,4 +1,8 @@
-<article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0">
+<!-- Converted by db4-upgrade version 1.0 -->
+
+<article xmlns="http://docbook.org/ns/docbook" version="5.0"
+	 xmlns:xi="http://www.w3.org/2001/XInclude"
+>
  <info><title>Crear Figuras Primitivas with <application>MGED</application></title>


@@ -128,10 +132,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged01_terminal.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged01_terminal.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -164,10 +165,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged01_commandwindow.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged01_commandwindow.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -180,10 +178,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged01_graphicswindow.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged01_graphicswindow.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -1,4 +1,8 @@
-<article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0">
+<!-- Converted by db4-upgrade version 1.0 -->
+
+<article xmlns="http://docbook.org/ns/docbook" version="5.0"
+	 xmlns:xi="http://www.w3.org/2001/XInclude"
+>
  <info><title>Reconocer las opciones de vistas en
 	   <application>MGED</application></title>

@@ -107,10 +111,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged02_defaultradio.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged02_defaultradio.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -253,8 +254,8 @@
 	  <tgroup cols="2" align="center">
 	    <tbody>
 	      <row>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged02_flower_zoomin.jpg" scale="60"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged02_flower_zoomin.jpg" scale="60"/></imageobject></inlinemediaobject></entry>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged02_flower_zoomout.jpg"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged02_flower_zoomout.jpg"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged02_flower_zoomin.jpg" scale="60"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged02_flower_zoomout.jpg"/></imageobject></inlinemediaobject></entry>
 	      </row>
 	      <row>
 		<entry>Zoom de acercamiento para ver detalles
@@ -356,8 +357,8 @@
 	    <colspec colwidth="3*"/>
 	    <tbody>
 	      <row>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged02_truck_front.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged02_truck_front.png"/></imageobject></inlinemediaobject></entry>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged02_truck_35_0.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged02_truck_35_0.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged02_truck_front.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged02_truck_35_0.png"/></imageobject></inlinemediaobject></entry>
 	      </row>
 	      <row>
 		<entry>Front (az=0, el=0)</entry>
@@ -373,8 +374,8 @@
 	    <colspec colwidth="1*"/>
 	    <tbody>
 	      <row>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged02_truck_left.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged02_truck_left.png"/></imageobject></inlinemediaobject></entry>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged02_truck_rear.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged02_truck_rear.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged02_truck_left.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged02_truck_rear.png"/></imageobject></inlinemediaobject></entry>
 	      </row>
 	      <row>
 		<entry>Left (az=90, el=0)</entry>
@@ -388,7 +389,7 @@
 	  <tgroup cols="1" align="center">
 	    <tbody>
 	      <row>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged02_truck_right.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged02_truck_right.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged02_truck_right.png"/></imageobject></inlinemediaobject></entry>
 	      </row>
 	      <row>
 		<entry>Right (az=270, el=0)</entry>
@@ -415,24 +416,24 @@
 	  <tgroup cols="2" align="center">
 	    <tbody>
 	      <row>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged02_truck_35_0.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged02_truck_35_0.png"/></imageobject></inlinemediaobject></entry>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged02_truck_35_25.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged02_truck_35_25.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged02_truck_35_0.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged02_truck_35_25.png"/></imageobject></inlinemediaobject></entry>
 	      </row>
 	      <row>
 		<entry>az=35, el=0</entry>
 		<entry>az=35, el=25</entry>
 	      </row>
 	      <row>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged02_truck_35_60.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged02_truck_35_60.png"/></imageobject></inlinemediaobject></entry>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged02_truck_35_90.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged02_truck_35_90.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged02_truck_35_60.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged02_truck_35_90.png"/></imageobject></inlinemediaobject></entry>
 	      </row>
 	      <row>
 		<entry>az=35, el=60</entry>
 		<entry>az=35, el=90</entry>
 	      </row>
 	      <row>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged02_truck_270_90.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged02_truck_270_90.png"/></imageobject></inlinemediaobject></entry>
-		<entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged02_truck_270_-90.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged02_truck_270_-90.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged02_truck_270_90.png"/></imageobject></inlinemediaobject></entry>
+		<entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged02_truck_270_-90.png"/></imageobject></inlinemediaobject></entry>
 	      </row>
 	      <row>
 		<entry>Top (az=270, el=90)</entry>
@@ -458,7 +459,7 @@
 	    <tgroup cols="1" align="center">
 	      <tbody>
 		<row>
-		  <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged02_truck_0_0_14.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged02_truck_0_0_14.png"/></imageobject></inlinemediaobject></entry>
+		  <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged02_truck_0_0_14.png"/></imageobject></inlinemediaobject></entry>
 		</row>
 		<row>
 		  <entry>Front (az=0, el=0, tw=14)</entry>
@@ -486,10 +487,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged02_coordsys.png" scale="60" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged02_coordsys.png" scale="60" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -529,16 +527,16 @@
 	<tgroup cols="2" align="center">
 	  <tbody>
 	    <row>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged02_radio_top.png" scale="90"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged02_radio_top.png" scale="90"/></imageobject></inlinemediaobject></entry>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged02_radio_35_25.png" scale="90"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged02_radio_35_25.png" scale="90"/></imageobject></inlinemediaobject></entry>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged02_radio_top.png" scale="90"/></imageobject></inlinemediaobject></entry>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged02_radio_35_25.png" scale="90"/></imageobject></inlinemediaobject></entry>
 	    </row>
 	    <row>
 	      <entry>Top</entry>
 	      <entry>az35,el25</entry>
 	    </row>
 	    <row>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged02_radio_right.png" scale="90"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged02_radio_right.png" scale="90"/></imageobject></inlinemediaobject></entry>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged02_radio_front.png" scale="90"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged02_radio_front.png" scale="90"/></imageobject></inlinemediaobject></entry>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged02_radio_right.png" scale="90"/></imageobject></inlinemediaobject></entry>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged02_radio_front.png" scale="90"/></imageobject></inlinemediaobject></entry>
 	    </row>
 	    <row>
 	      <entry>Right</entry>
@@ -568,10 +566,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged02_multipane.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged02_multipane.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -1,4 +1,8 @@
-<article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0">
+<!-- Converted by db4-upgrade version 1.0 -->
+
+<article xmlns="http://docbook.org/ns/docbook" version="5.0"
+	 xmlns:xi="http://www.w3.org/2001/XInclude"
+>
  <info><title>Usar el comando Insert en <application>MGED</application> para
    dimensionar y ubicar figuras</title>

@@ -74,7 +78,7 @@
      </para>

      <para>
-	Como pudo apreciar en el tutorial #1, este comando le dice a <application>MGED</application> que:
+	Como pudo apreciar en el tuorial #1, este comando le dice a <application>MGED</application> que:

 	<informaltable frame="all">
 	  <tgroup cols="3">
@@ -89,10 +93,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/mged/using_insert_command_images/wireframesphere.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/mged/using_insert_command_images/wireframesphere.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -120,10 +121,7 @@
 	previamente creada.
      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged03_wireframespherecylinder.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged03_wireframespherecylinder.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -273,8 +271,8 @@
 	<tgroup cols="2">
 	  <tbody>
 	    <row>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged03_shapes_make_command.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged03_shapes_make_command.png"/></imageobject></inlinemediaobject></entry>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged03_shapes_in_command.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged03_shapes_in_command.png"/></imageobject></inlinemediaobject></entry>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged03_shapes_make_command.png"/></imageobject></inlinemediaobject></entry>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged03_shapes_in_command.png"/></imageobject></inlinemediaobject></entry>
 	    </row>
 	    <row>
 	      <entry>Figuras creadas con el comando make</entry>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Asignación de propiedades de los materiales y trazado de rayos
 	   (Raytracing) en <application>MGED</application></title>
@@ -182,10 +184,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged04_commandwindow.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged04_commandwindow.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -309,10 +308,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged04_raytracedshapes.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged04_raytracedshapes.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -369,9 +365,9 @@
 	<tgroup cols="2">
 	  <tbody>
 	    <row>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged04_raytracedshapes.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged04_raytracedshapes.png"/></imageobject></inlinemediaobject>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged04_raytracedshapes.png"/></imageobject></inlinemediaobject>
 	      </entry>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged04_fb_overlay_mode.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged04_fb_overlay_mode.png"/></imageobject></inlinemediaobject>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged04_fb_overlay_mode.png"/></imageobject></inlinemediaobject>
 	      </entry>
 	    </row>
 	    <row>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Expresiones Booleanas</title>

@@ -122,10 +124,7 @@

 	<informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged05_unionspheres.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged05_unionspheres.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -159,10 +158,7 @@

 	<informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged05_subtractionspheres.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged05_subtractionspheres.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -205,10 +201,7 @@

 	<informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged05_intersectionspheres.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged05_intersectionspheres.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -245,10 +238,7 @@

 	<informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged05_twoprimitivespheres.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged05_twoprimitivespheres.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -315,10 +305,7 @@

 	<informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged05_combinationeditor.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged05_combinationeditor.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -363,9 +350,9 @@
 	<tgroup cols="2">
 	  <tbody>
 	    <row>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged05_raytracedpart1.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged05_raytracedpart1.png"/></imageobject></inlinemediaobject>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged05_raytracedpart1.png"/></imageobject></inlinemediaobject>
 	      </entry>
-	      <entry><inlinemediaobject><imageobject role="html"><imagedata fileref="../../lessons/es/images/mged05_raytracedpart2.png"/></imageobject><imageobject role="fo"><imagedata fileref="../../lessons/es/images/mged05_raytracedpart2.png"/></imageobject></inlinemediaobject>
+	      <entry><inlinemediaobject><imageobject><imagedata fileref="../../lessons/es/images/mged05_raytracedpart2.png"/></imageobject></inlinemediaobject>
 	      </entry>
 	    </row>
 	    <row>
@@ -448,10 +435,7 @@

 	<informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged05_raytracedpart3.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged05_raytracedpart3.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -520,10 +504,7 @@

 	<informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged05_raytraceddome.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged05_raytraceddome.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>Crear una copa</title>

@@ -39,10 +41,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged06_rtgoblet.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged06_rtgoblet.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -102,10 +101,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged06_gobletbase.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged06_gobletbase.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -138,10 +134,7 @@
 	siguiente.
      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged06_goblet1stsphere.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged06_goblet1stsphere.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -227,10 +220,7 @@
 	terminado, su copa se parecerá a la siguiente desde una vista frontal:
      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged06_gobletstem.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged06_gobletstem.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -263,10 +253,7 @@
 	mouse combinado con las vistas múltiples para posicionar la cuenca.
      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged06_gobletbasestembasin.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged06_gobletbasestembasin.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -435,10 +422,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged06_base_subtracted_vol.png" format="PNG"/>
-	  </imageobject>
-	<imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged06_base_subtracted_vol.png" format="PNG"/>
 	  </imageobject>
 	</mediaobject>
@@ -466,10 +450,7 @@
 	La copa lucirá similar a la de la siguiente ilustración:
      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged06_rtgobletaz_35el_25.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged06_rtgobletaz_35el_25.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -1,3 +1,5 @@
+<!-- Converted by db4-upgrade version 1.0 -->
+
 <article xmlns="http://docbook.org/ns/docbook" version="5.0">
  <info><title>
      Asignar propiedades de los materiales a una copa
@@ -44,10 +46,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged07_goblet_mater_complete.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged07_goblet_mater_complete.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -186,10 +185,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged07_goblet_complete_window.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged07_goblet_complete_window.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -240,10 +236,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged07_goblet_semitransparent.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged07_goblet_semitransparent.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -281,10 +274,7 @@

      <informalfigure>
 	<mediaobject>
-	  <imageobject role="html">
-	    <imagedata align="center" fileref="../../lessons/es/images/mged07_goblet_mirror.png" format="PNG"/>
-	  </imageobject>
-	  <imageobject role="fo">
+	  <imageobject>
 	    <imagedata align="center" fileref="../../lessons/es/images/mged07_goblet_mirror.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Clifford Yapp	48694feeea	Nevermind, after discussion with Sean the idea is to baseline on C89 and then move forward, not continually maintain support for various standards. (svn branch delete) svn:revision:58033 svn:branch:compiler-flags svn:account:starseeker	2013-10-01 16:15:58 +00:00
Clifford Yapp	c94f7271e9	Start working on a generalized mechanism for selecting and reporting C and C++ standards for compilation svn:revision:58031 svn:branch:compiler-flags svn:account:starseeker	2013-10-01 15:48:53 +00:00
Clifford Yapp	769bb9d26e	Make a branch to try some compiler flag rework svn:revision:58028 svn:branch:compiler-flags svn:account:starseeker	2013-10-01 14:41:54 +00:00