Index: doc/docbook/lessons/es/mged16_mod_tech_struct.xml
===================================================================
--- doc/docbook/lessons/es/mged16_mod_tech_struct.xml	(revision 58600)
+++ doc/docbook/lessons/es/mged16_mod_tech_struct.xml	(working copy)
@@ -46,9 +46,12 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_new_design.png" format="PNG"/>
 	  </imageobject>
+	  <imageobject role="fo">
+	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_new_design.png" format="PNG"/>
+	  </imageobject>
 	  <caption>
 	    <para>
 	     Radio Walkie-Talkie
@@ -166,9 +169,12 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_default_components_props.png" format="PNG"/>
 	  </imageobject>
+	  <imageobject role="fo">
+	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_default_components_props.png" format="PNG"/>
+	  </imageobject>
 	  <caption>
 	    <para>
 	     Radio con orificios para los componentes
@@ -364,9 +370,12 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_with_mater_props.png" format="PNG"/>
 	  </imageobject>
+	  <imageobject role="fo">
+	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_with_mater_props.png" format="PNG"/>
+	  </imageobject>
 	  <caption>
 	    <para>
 	     Radio con propiedades de los materiales asignadas
@@ -442,9 +451,12 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_wireframe_circ_board.png" format="PNG"/>
 	  </imageobject>
+	  <imageobject role="fo">
+	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_wireframe_circ_board.png" format="PNG"/>
+	  </imageobject>
 	  <caption>
 	    <para>
 	     Representación en malla de alambre del radio con
@@ -603,9 +615,12 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_transparent.png" format="PNG"/>
 	  </imageobject>
+	  <imageobject role="fo">
+	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_transparent.png" format="PNG"/>
+	  </imageobject>
 	  <caption>
 	    <para>
 	     Vista transparente de la radio
@@ -717,9 +732,12 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_cut_wireframe.png" format="PNG"/>
 	  </imageobject>
+	  <imageobject role="fo">
+	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_cut_wireframe.png" format="PNG"/>
+	  </imageobject>
 	  <caption>
 	    <para>
 	     Vista multipanel del primitivo de corte
@@ -737,9 +755,12 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_cut_raytrace.png" format="PNG"/>
 	  </imageobject>
+	  <imageobject role="fo">
+	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_cut_raytrace.png" format="PNG"/>
+	  </imageobject>
 	  <caption>
 	    <para>
 	     Vista en corte del radio con la placa de circuitos
@@ -789,9 +810,12 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_cutaways.png" format="PNG"/>
 	  </imageobject>
+	  <imageobject role="fo">
+	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_cutaways.png" format="PNG"/>
+	  </imageobject>
 	  <caption>
 	    <para>
 	     Subtractions de cortes
@@ -819,9 +843,12 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_structure_1.png" format="PNG"/>
 	  </imageobject>
+	  <imageobject role="fo">
+	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_structure_1.png" format="PNG"/>
+	  </imageobject>
 	  <caption>
 	    <para>
 	     Estructura de la radio actual
@@ -838,9 +865,12 @@
       </para>
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_structure_2.png" format="PNG"/>
 	  </imageobject>
+	  <imageobject role="fo">
+	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_structure_2.png" format="PNG"/>
+	  </imageobject>
 	  <caption>
 	    <para>
 	     Location-Based Structure of Radio
@@ -863,9 +893,12 @@
       </para>
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_structure_3.png" format="PNG"/>
 	  </imageobject>
+	  <imageobject role="fo">
+	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_structure_3.png" format="PNG"/>
+	  </imageobject>
 	  <caption>
 	    <para>
 	     Estructura del radio basada en la funcionalidad
@@ -963,9 +996,12 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
 	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_casecut_raytrace.png" format="PNG"/>
 	  </imageobject>
+	  <imageobject role="fo">
+	    <imagedata align="center" fileref="../../lessons/en/images/mged16_radio_casecut_raytrace.png" format="PNG"/>
+	  </imageobject>
 	  <caption>
 	    <para>
 	     Vista del radio con la carcaza seccionada
Index: doc/docbook/lessons/es/mged02_opciones_vistas.xml
===================================================================
--- doc/docbook/lessons/es/mged02_opciones_vistas.xml	(revision 58600)
+++ doc/docbook/lessons/es/mged02_opciones_vistas.xml	(working copy)
@@ -111,9 +111,12 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
 	    <imagedata align="center" fileref="../../lessons/es/images/mged02_defaultradio.png" format="PNG"/>
 	  </imageobject>
+	  <imageobject role="fo">
+	    <imagedata align="center" fileref="../../lessons/es/images/mged02_defaultradio.png" format="PNG"/>
+	  </imageobject>
 	  <caption>
 	    <para>
 	     Vista del radio por defecto
@@ -487,9 +490,12 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
 	    <imagedata align="center" fileref="../../lessons/es/images/mged02_coordsys.png" scale="60" format="PNG"/>
 	  </imageobject>
+	  <imageobject role="fo">
+	    <imagedata align="center" fileref="../../lessons/es/images/mged02_coordsys.png" scale="60" format="PNG"/>
+	  </imageobject>
 	  <caption>
 	    <para>
 	      Acimut, elevación, y el sistema de coordenada xyz.
@@ -566,9 +572,12 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
 	    <imagedata align="center" fileref="../../lessons/es/images/mged02_multipane.png" format="PNG"/>
 	  </imageobject>
+	  <imageobject role="fo">
+	    <imagedata align="center" fileref="../../lessons/es/images/mged02_multipane.png" format="PNG"/>
+	  </imageobject>
 	  <caption>
 	    <para>
 	      Vista Mulipanel de la radio
Index: doc/docbook/lessons/es/mged15_crear_camion_de_juguete.xml
===================================================================
--- doc/docbook/lessons/es/mged15_crear_camion_de_juguete.xml	(revision 58600)
+++ doc/docbook/lessons/es/mged15_crear_camion_de_juguete.xml	(working copy)
@@ -66,7 +66,10 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../lessons/es/images/mged15_truck_design.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../lessons/es/images/mged15_truck_design.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -133,7 +136,10 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../lessons/es/images/mged15_truck_cab1s.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../lessons/es/images/mged15_truck_cab1s.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -236,7 +242,10 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../lessons/es/images/mged15_truck_cab_cutoff.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../lessons/es/images/mged15_truck_cab_cutoff.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -280,7 +289,10 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../lessons/es/images/mged15_truck_multipane_1stwheel.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../lessons/es/images/mged15_truck_multipane_1stwheel.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -354,7 +366,10 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../lessons/es/images/mged15_prim_ed_wheel_well.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../lessons/es/images/mged15_prim_ed_wheel_well.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -377,7 +392,10 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../lessons/es/images/mged15_truck_2nd_wheel_wheel_place.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../lessons/es/images/mged15_truck_2nd_wheel_wheel_place.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -484,7 +502,10 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../lessons/es/images/mged15_truck_cab_body.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../lessons/es/images/mged15_truck_cab_body.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -513,7 +534,10 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../lessons/es/images/mged15_truck_wheel_wells_wireframe.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../lessons/es/images/mged15_truck_wheel_wells_wireframe.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -619,7 +643,10 @@
 	similar a la siguiente:
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../lessons/es/images/mged15_truck_wheels.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../lessons/es/images/mged15_truck_wheels.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -674,7 +701,10 @@
 	tener este aspecto:
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../lessons/es/images/mged15_cameo_shader.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../lessons/es/images/mged15_cameo_shader.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
Index: doc/docbook/lessons/en/mged02_learning_viewing_options.xml
===================================================================
--- doc/docbook/lessons/en/mged02_learning_viewing_options.xml	(revision 58600)
+++ doc/docbook/lessons/en/mged02_learning_viewing_options.xml	(working copy)
@@ -109,9 +109,12 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
 	    <imagedata align="center" fileref="../../lessons/en/images/mged02_defaultradio.png" format="PNG"/>
 	  </imageobject>
+	  <imageobject role="fo">
+	    <imagedata align="center" fileref="../../lessons/en/images/mged02_defaultradio.png" format="PNG"/>
+	  </imageobject>
 	  <caption>
 	    <para>
 	     Default View of a Radio
@@ -465,9 +468,12 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
 	    <imagedata align="center" fileref="../../lessons/en/images/mged02_coordsys.png" scale="60" format="PNG"/>
 	  </imageobject>
+	  <imageobject role="fo">
+	    <imagedata align="center" fileref="../../lessons/en/images/mged02_coordsys.png" scale="60" format="PNG"/>
+	  </imageobject>
 	  <caption>
 	    <para>
 	      Azimuth, Elevation, and the xyz Coordinate System
@@ -540,9 +546,12 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
 	    <imagedata align="center" fileref="../../lessons/en/images/mged02_multipane.png" format="PNG"/>
 	  </imageobject>
+	  <imageobject role="fo">
+	    <imagedata align="center" fileref="../../lessons/en/images/mged02_multipane.png" format="PNG"/>
+	  </imageobject>
 	  <caption>
 	    <para>
 	      Multipane View of the Radio
Index: doc/docbook/articles/en/pipes.xml
===================================================================
--- doc/docbook/articles/en/pipes.xml	(revision 58600)
+++ doc/docbook/articles/en/pipes.xml	(working copy)
@@ -80,27 +80,36 @@
     <figure><info><title>Basic pipe with parameters.</title></info>
 
       <mediaobject>
-	<imageobject>
+	<imageobject role="html">
 	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig01.png" format="PNG"/>
 	</imageobject>
+	<imageobject role="fo">
+	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig01.png" format="PNG"/>
+	</imageobject>
       </mediaobject>
     </figure>
 
     <figure><info><title>Various bend radii.</title></info>
 
       <mediaobject>
-	<imageobject>
+	<imageobject role="html">
 	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig02.png" format="PNG"/>
 	</imageobject>
+	<imageobject role="fo">
+	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig02.png" format="PNG"/>
+	</imageobject>
       </mediaobject>
     </figure>
 
     <figure><info><title>Example of special uses of the pipe.</title></info>
 
       <mediaobject>
-	<imageobject>
+	<imageobject role="html">
 	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig03.png" format="PNG"/>
 	</imageobject>
+	<imageobject role="fo">
+	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig03.png" format="PNG"/>
+	</imageobject>
       </mediaobject>
     </figure>
 
@@ -181,9 +190,12 @@
     <figure><info><title>Determining the point positions for the copper coil.</title></info>
 
       <mediaobject>
-	<imageobject>
+	<imageobject role="html">
 	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig04.png" format="PNG"/>
 	</imageobject>
+	<imageobject role="fo">
+	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig04.png" format="PNG"/>
+	</imageobject>
       </mediaobject>
     </figure>
 
@@ -328,9 +340,12 @@
     <figure><info><title>Raytraced coil segment.</title></info>
 
       <mediaobject>
-	<imageobject>
+	<imageobject role="html">
 	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig13.png" format="PNG"/>
 	</imageobject>
+	<imageobject role="fo">
+	  <imagedata align="center" fileref="../../articles/en/images/pipes_fig13.png" format="PNG"/>
+	</imageobject>
       </mediaobject>
     </figure>