Merge commit 'refs/remotes/origin/5.1'
Pierre MARECHAL [Thu, 15 Jan 2009 14:01:37 +0000 (15:01 +0100)]
Conflicts:

scilab/modules/graphic_export/help/en_US/xs2bmp.xml
scilab/modules/graphic_export/help/en_US/xs2emf.xml
scilab/modules/graphic_export/help/en_US/xs2eps.xml
scilab/modules/graphic_export/help/en_US/xs2fig.xml
scilab/modules/graphic_export/help/en_US/xs2gif.xml
scilab/modules/graphic_export/help/en_US/xs2jpg.xml
scilab/modules/graphic_export/help/en_US/xs2pdf.xml
scilab/modules/graphic_export/help/en_US/xs2png.xml
scilab/modules/graphic_export/help/en_US/xs2ppm.xml
scilab/modules/graphic_export/help/en_US/xs2ps.xml
scilab/modules/graphic_export/help/en_US/xs2svg.xml

1  2 
scilab/modules/graphic_export/help/en_US/xs2bmp.xml
scilab/modules/graphic_export/help/en_US/xs2emf.xml
scilab/modules/graphic_export/help/en_US/xs2eps.xml
scilab/modules/graphic_export/help/en_US/xs2fig.xml
scilab/modules/graphic_export/help/en_US/xs2gif.xml
scilab/modules/graphic_export/help/en_US/xs2jpg.xml
scilab/modules/graphic_export/help/en_US/xs2pdf.xml
scilab/modules/graphic_export/help/en_US/xs2png.xml
scilab/modules/graphic_export/help/en_US/xs2ppm.xml
scilab/modules/graphic_export/help/en_US/xs2ps.xml
scilab/modules/graphic_export/help/en_US/xs2svg.xml

@@@ -72,12 -65,12 +72,11 @@@ xs2bmp(fig, file_name)</synopsis
  
    <refsection>
      <title>Examples</title>
--
-     <programlisting role="example">    scf(0)
-     plot2d()
-     //BMP export
-     xs2bmp(0,'foo.bmp')
-       xs2bmp(gcf(), 'foo.bmp');
+     <programlisting role="example">
+ scf(0)
+ plot2d()
+ //BMP export
+ xs2bmp(0,'foo.bmp');
    </programlisting>
    </refsection>
  
  
      <para>A.C</para>
    </refsection>
--</refentry>
++</refentry>
@@@ -85,12 -79,14 +85,13 @@@ xs2emf(fig, file_name [,orientation])</
  
    <refsection>
      <title>Examples</title>
--
-     <programlisting role="example">    scf(0)
-     plot2d()
-     //EMF export
-     xs2emf(0,'foo.emf')
-     xs2emf(gcf(),'foo.emf')
+     <programlisting role="example">
+ if MSDOS then
+   scf(0);
+   plot2d();
+   //EMF export
+   xs2emf(0,'foo.emf');
+ end
    </programlisting>
    </refsection>
  
@@@ -84,12 -79,12 +84,12 @@@ xs2eps(fig, file_name [,orientation])</
      <title>Examples</title>
  
      <programlisting role="example"> 
-     scf(0)
-     plot2d()
-     //EPS export
-     xs2eps(0,'foo.eps')
-     xs2eps(gcf(),'foo.eps')
-   </programlisting>
 -scf(0);
 -plot2d();
++scf(0)
++plot2d()
+ //EPS export
 -filename='foo.eps';
 -xs2eps(0,filename);
 -  </programlisting>
++xs2eps(0,'foo.eps')
++xs2eps(gcf(),'foo.eps')
++    </programlisting>
    </refsection>
  
    <refsection>
@@@ -85,11 -84,10 +85,11 @@@ xs2fig(fig, file_name [,orientation])</
      <title>Examples</title>
  
      <programlisting role="example"> 
-     //simple example
-     scf(0)
-     plot2d()
-     xs2fig(0,'foo.fig')
-     xs2fig(gcf(),'foo.fig')
+ //simple example
+ scf(0);
+ plot2d();
+ xs2fig(0,'foo.fig');
++xs2fig(gcf(),'foo.fig')
    </programlisting>
    </refsection>
  
  
      <para>S.K</para>
    </refsection>
--</refentry>
++</refentry>
@@@ -87,11 -80,10 +87,12 @@@ xs2gif(fig,file_name)</synopsis
    <refsection>
      <title>Examples</title>
  
--    <programlisting role="example">    scf(0)
-     plot2d()
-     //GIF export
-     xs2gif(0,'foo.gif')
-     xs2gif(gcf(),'foo.gif')
 -plot2d()
++    <programlisting role="example">
++scf(0);
++plot2d();
+ //GIF export
+ xs2gif(0,'foo.gif');
++xs2gif(gcf(),'foo.gif');
    </programlisting>
    </refsection>
  
        <member><link linkend="xs2emf">xs2emf</link></member>
      </simplelist>
    </refsection>
--</refentry>
++</refentry>
@@@ -72,12 -65,12 +72,12 @@@ xs2jpg(fig, file_name)</synopsis
  
    <refsection>
      <title>Examples</title>
--
-     <programlisting role="example">    scf(0)
-     plot2d()
-     //JPG export
-     xs2jpg(0,'foo.jpg')
-     xs2jpg(gcf(),'foo.jpg')
+     <programlisting role="example">
+ scf(0);
+ plot2d();
+ //JPG export
+ xs2jpg(0,'foo.jpg');
++xs2jpg(gcf(),'foo.jpg');
    </programlisting>
    </refsection>
  
  
      <para>S.K</para>
    </refsection>
--</refentry>
++</refentry>
@@@ -82,11 -76,11 +82,12 @@@ xs2pdf(fig, file_name [,orientation])</
      <title>Examples</title>
  
      <programlisting role="example"> 
-     scf(0)
-     plot2d()
-     //PDF export
-     xs2pdf(0,'foo.pdf')
-     xs2pdf(gcf(),'foo.pdf')
+ scf(0);
+ plot2d();
+ //PDF export
+ filename='foo'; // ! no extension
+ xs2pdf(0,filename);
++xs2pdf(gcf(),filename);
    </programlisting>
    </refsection>
  
        <member><link linkend="xs2emf">xs2emf</link></member>
      </simplelist>
    </refsection>
--</refentry>
++</refentry>
@@@ -76,8 -69,7 +76,8 @@@ xs2png(fig, file_name)</synopsis
      <programlisting role="example">    scf(0)
      plot2d()
      //PNG export
-     xs2png(0,'foo.png')
-     xs2png(gcf(),'foo.png')
 -    xs2png(0,'foo.png');
++xs2png(0,'foo.png');
++xs2png(gcf(),'foo.png');
    </programlisting>
    </refsection>
  
  
      <para>S.K</para>
    </refsection>
--</refentry>
++</refentry>
@@@ -106,4 -98,4 +106,4 @@@ xs2ppm(fig, file_name)</synopsis
        <member><link linkend="xs2emf">xs2emf</link></member>
      </simplelist>
    </refsection>
--</refentry>
++</refentry>
@@@ -128,4 -121,4 +128,4 @@@ xs2ps(gcf(),'foo.ps')
        <member><link linkend="xs2emf">xs2emf</link></member>
      </simplelist>
    </refsection>
--</refentry>
++</refentry>
@@@ -122,4 -115,4 +122,4 @@@ xs2svg(fig, file_name [,orientation])</
        <member><link linkend="xs2emf">xs2emf</link></member>
      </simplelist>
    </refsection>
--</refentry>
++</refentry>