Index: doc/docbook/articles/en/tire.xml
===================================================================
--- doc/docbook/articles/en/tire.xml	(revision 58600)
+++ doc/docbook/articles/en/tire.xml	(working copy)
@@ -53,7 +53,10 @@
 
     <informalfigure>
       <mediaobject>
-	<imageobject>
+	<imageobject role="html">
+	  <imagedata align="center" fileref="../../articles/en/images/tire_fig01.pNG" format="png"/>
+	</imageobject>
+	<imageobject role="fo">
 	  <imagedata align="center" fileref="../../articles/en/images/tire_fig01.png" format="PNG"/>
 	</imageobject>
 	<caption>
@@ -172,7 +175,10 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../articles/en/images/tire_fig02.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig02.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -197,7 +203,10 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../articles/en/images/tire_fig03.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig03.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -276,7 +285,10 @@
     <para>
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../articles/en/images/tire_fig04.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig04.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -296,7 +308,10 @@
     <para>
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../articles/en/images/tire_fig05.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig05.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -320,7 +335,10 @@
     <para>
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../articles/en/images/tire_fig06.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig06.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -347,7 +365,10 @@
     <para>
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../articles/en/images/tire_fig07.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig07.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -372,7 +393,10 @@
     <para>
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../articles/en/images/tire_fig08.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig08.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -428,7 +452,10 @@
     <para>
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../articles/en/images/tire_fig09.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig09.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -449,7 +476,10 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../articles/en/images/tire_fig10.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig10.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -475,7 +505,10 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../articles/en/images/tire_fig11.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig11.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -503,7 +536,10 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../articles/en/images/tire_fig12.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig12.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -528,7 +564,10 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../articles/en/images/tire_fig13.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig13.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
@@ -585,7 +624,10 @@
 
       <informalfigure>
 	<mediaobject>
-	  <imageobject>
+	  <imageobject role="html">
+	    <imagedata align="center" fileref="../../articles/en/images/tire_fig14.pNG" format="png"/>
+	  </imageobject>
+	  <imageobject role="fo">
 	    <imagedata align="center" fileref="../../articles/en/images/tire_fig14.png" format="PNG"/>
 	  </imageobject>
 	  <caption>
Index: doc/docbook/articles/en/oed.xml
===================================================================
--- doc/docbook/articles/en/oed.xml	(revision 58600)
+++ doc/docbook/articles/en/oed.xml	(working copy)
@@ -55,7 +55,7 @@
 
     <para>
     <screenshot>
-      <mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig01.png"/></imageobject></mediaobject>
+      <mediaobject><imageobject role="html"><imagedata align="center" fileref="../../articles/en/images/oed_fig01.png"/></imageobject><imageobject role="fo"><imagedata align="center" fileref="../../articles/en/images/oed_fig01.png"/></imageobject></mediaobject>
     </screenshot>
     </para>
 
@@ -202,7 +202,7 @@
 
     <para>
       <screenshot>
-	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig02.png"/></imageobject></mediaobject>
+	<mediaobject><imageobject role="html"><imagedata align="center" fileref="../../articles/en/images/oed_fig02.png"/></imageobject><imageobject role="fo"><imagedata align="center" fileref="../../articles/en/images/oed_fig02.png"/></imageobject></mediaobject>
       </screenshot>
     </para>
 
@@ -265,7 +265,7 @@
 
     <para>
       <screenshot>
-	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig03.png"/></imageobject></mediaobject>
+	<mediaobject><imageobject role="html"><imagedata align="center" fileref="../../articles/en/images/oed_fig03.png"/></imageobject><imageobject role="fo"><imagedata align="center" fileref="../../articles/en/images/oed_fig03.png"/></imageobject></mediaobject>
       </screenshot>
     </para>
 
@@ -278,7 +278,7 @@
 
     <para>
       <screenshot>
-	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig04.png"/></imageobject></mediaobject>
+	<mediaobject><imageobject role="html"><imagedata align="center" fileref="../../articles/en/images/oed_fig04.png"/></imageobject><imageobject role="fo"><imagedata align="center" fileref="../../articles/en/images/oed_fig04.png"/></imageobject></mediaobject>
       </screenshot>
     </para>
 
@@ -290,7 +290,7 @@
 
     <para>
       <screenshot>
-	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig05.png"/></imageobject></mediaobject>
+	<mediaobject><imageobject role="html"><imagedata align="center" fileref="../../articles/en/images/oed_fig05.png"/></imageobject><imageobject role="fo"><imagedata align="center" fileref="../../articles/en/images/oed_fig05.png"/></imageobject></mediaobject>
       </screenshot>
     </para>
 
@@ -341,7 +341,7 @@
 
     <para>
       <screenshot>
-	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig06.png"/></imageobject></mediaobject>
+	<mediaobject><imageobject role="html"><imagedata align="center" fileref="../../articles/en/images/oed_fig06.png"/></imageobject><imageobject role="fo"><imagedata align="center" fileref="../../articles/en/images/oed_fig06.png"/></imageobject></mediaobject>
       </screenshot>
     </para>
 
@@ -469,7 +469,7 @@
 
     <para>
       <screenshot>
-	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig07.png"/></imageobject></mediaobject>
+	<mediaobject><imageobject role="html"><imagedata align="center" fileref="../../articles/en/images/oed_fig07.png"/></imageobject><imageobject role="fo"><imagedata align="center" fileref="../../articles/en/images/oed_fig07.png"/></imageobject></mediaobject>
       </screenshot>
     </para>
 
@@ -510,7 +510,7 @@
 
     <para>
       <screenshot>
-	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig08.png"/></imageobject></mediaobject>
+	<mediaobject><imageobject role="html"><imagedata align="center" fileref="../../articles/en/images/oed_fig08.png"/></imageobject><imageobject role="fo"><imagedata align="center" fileref="../../articles/en/images/oed_fig08.png"/></imageobject></mediaobject>
       </screenshot>
     </para>
 
@@ -582,7 +582,7 @@
     <literallayout class="monospaced">accept</literallayout>
 
     <screenshot>
-      <mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig09.png"/></imageobject></mediaobject>
+      <mediaobject><imageobject role="html"><imagedata align="center" fileref="../../articles/en/images/oed_fig09.png"/></imageobject><imageobject role="fo"><imagedata align="center" fileref="../../articles/en/images/oed_fig09.png"/></imageobject></mediaobject>
     </screenshot>
 
     <literallayout class="monospaced">
@@ -619,7 +619,7 @@
 
     <para>
       <screenshot>
-	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig10.png"/></imageobject></mediaobject>
+	<mediaobject><imageobject role="html"><imagedata align="center" fileref="../../articles/en/images/oed_fig10.png"/></imageobject><imageobject role="fo"><imagedata align="center" fileref="../../articles/en/images/oed_fig10.png"/></imageobject></mediaobject>
       </screenshot>
     </para>
 
@@ -669,7 +669,7 @@
 
     <para>
       <screenshot>
-	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig11.png"/></imageobject></mediaobject>
+	<mediaobject><imageobject role="html"><imagedata align="center" fileref="../../articles/en/images/oed_fig11.png"/></imageobject><imageobject role="fo"><imagedata align="center" fileref="../../articles/en/images/oed_fig11.png"/></imageobject></mediaobject>
       </screenshot>
     </para>
 
@@ -684,7 +684,7 @@
 
     <para>
       <screenshot>
-	<mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig12.png"/></imageobject></mediaobject>
+	<mediaobject><imageobject role="html"><imagedata align="center" fileref="../../articles/en/images/oed_fig12.png"/></imageobject><imageobject role="fo"><imagedata align="center" fileref="../../articles/en/images/oed_fig12.png"/></imageobject></mediaobject>
       </screenshot>
     </para>
 
@@ -750,7 +750,7 @@
     <literallayout class="monospaced">B bigobject.r</literallayout>
 
     <screenshot>
-      <mediaobject><imageobject><imagedata align="center" fileref="../../articles/en/images/oed_fig13.png"/></imageobject></mediaobject>
+      <mediaobject><imageobject role="html"><imagedata align="center" fileref="../../articles/en/images/oed_fig13.png"/></imageobject><imageobject role="fo"><imagedata align="center" fileref="../../articles/en/images/oed_fig13.png"/></imageobject></mediaobject>
     </screenshot>
     </para>
 
Index: doc/docbook/articles/en/nirt.xml
===================================================================
--- doc/docbook/articles/en/nirt.xml	(revision 58600)
+++ doc/docbook/articles/en/nirt.xml	(working copy)
@@ -98,7 +98,10 @@
       <para>
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig01.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig01.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -551,7 +554,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig02.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig02.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -566,7 +572,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig03.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig03.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -620,7 +629,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig04.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig04.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -651,7 +663,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig05.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig05.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -708,7 +723,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig06.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig06.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -751,7 +769,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig07.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig07.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -794,7 +815,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig08.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig08.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -826,7 +850,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig09.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig09.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -865,7 +892,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig10.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig10.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -953,7 +983,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig11.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig11.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -975,7 +1008,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig12.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig12.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -995,7 +1031,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig13.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig13.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1014,7 +1053,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig14.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig14.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1039,7 +1081,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig08.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig08.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1078,7 +1123,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig15.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig15.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1105,7 +1153,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig16.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig16.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1128,7 +1179,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig17.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig17.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1183,7 +1237,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig18.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig18.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1537,7 +1594,10 @@
 	The Query Ray Control Panel also offers a way to select the Use Air option:
 <informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig20.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig20.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1853,7 +1913,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig22.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig22.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1895,7 +1958,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig23.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig23.png" format="PNG"/>
 	    </imageobject>
 	    <caption>
@@ -1916,7 +1982,10 @@
 
 	<informalfigure>
 	  <mediaobject>
-	    <imageobject>
+	    <imageobject role="html">
+	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig24.pNG" format="PNg"/>
+	    </imageobject>
+	    <imageobject role="fo">
 	      <imagedata align="center" fileref="../../articles/en/images/nirt_fig24.png" format="PNG"/>
 	    </imageobject>
 	    <caption>