scanf/printf_conversion documentation corrected. 01/12401/2
Cedric Delamarre [Mon, 2 Sep 2013 09:35:32 +0000 (11:35 +0200)]
Change-Id: I1d673b054ea5e62f68570b1b022f72e86415d74a

scilab/modules/fileio/help/en_US/scanf_conversion.xml
scilab/modules/fileio/help/ja_JP/scanf_conversion.xml
scilab/modules/fileio/help/ru_RU/scanf_conversion.xml
scilab/modules/output_stream/help/en_US/printf_conversion.xml
scilab/modules/output_stream/help/ja_JP/printf_conversion.xml
scilab/modules/output_stream/help/pt_BR/printf_conversion.xml

index bd52f99..a7547df 100644 (file)
@@ -3,11 +3,11 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
  * ...
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
         <title>See Also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="scanf">mcscanf</link>
+                <link linkend="msscanf">msscanf</link>
+            </member>
+            <member>
+                <link linkend="mfscanf">mfscanf</link>
+            </member>
+            <member>
+                <link linkend="mscanf">mscanf</link>
             </member>
             <member>
                 <link linkend="printf_conversion">printf_conversion</link>
index 8cfa07d..84bc88d 100644 (file)
@@ -3,18 +3,18 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
  * ...
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="scanf_conversion">
     <refnamediv>
         <refname>scanf_conversion</refname>
-        <refpurpose>scanf, sscanf, fscanf 変換指定子</refpurpose>
+        <refpurpose>scanf, msscanf, mfscanf 変換指定子</refpurpose>
     </refnamediv>
     <refsection>
         <title>説明</title>
         <title>参照</title>
         <simplelist type="inline">
             <member>
-                <link linkend="scanf">scanf</link>
+                <link linkend="msscanf">msscanf</link>
+            </member>
+            <member>
+                <link linkend="mfscanf">mfscanf</link>
             </member>
             <member>
-                <link linkend="scanf">scanf</link>
+                <link linkend="mscanf">mscanf</link>
             </member>
             <member>
-                <link linkend="fscanf">fscanf</link>
+                <link linkend="printf_conversion">printf_conversion</link>
             </member>
         </simplelist>
     </refsection>
index e67bc9e..0b2ca33 100644 (file)
@@ -3,11 +3,11 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
  * ...
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
         <title>Смотрите также</title>
         <simplelist type="inline">
             <member>
-                <link linkend="scanf">mcscanf</link>
+                <link linkend="msscanf">msscanf</link>
+            </member>
+            <member>
+                <link linkend="mfscanf">mfscanf</link>
+            </member>
+            <member>
+                <link linkend="mscanf">mscanf</link>
             </member>
             <member>
                 <link linkend="printf_conversion">преобразование printf</link>
index c1edfa5..9bfa240 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) XXXX-2008 - INRIA
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
@@ -21,7 +21,7 @@
         <title>Description</title>
         <para>
             Each conversion specification in the <literal>mprintf</literal> ,
-            <literal>msprintf</literal> , <literal>fprintf</literal>
+            <literal>msprintf</literal> , <literal>mfprintf</literal>
             <literal>format</literal> parameter has the following syntax:
         </para>
         <itemizedlist>
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 mprintf('a string: %s\n', 'Scilab');
 mprintf('an integer: %d\n', 10);
 mprintf('an integer: %4d\n', 10);
@@ -326,7 +326,7 @@ mprintf('a character: %c\n', 'aaa');
                 <link linkend="mprintf">mprintf</link>
             </member>
             <member>
-                <link linkend="fprintf">fprintf</link>
+                <link linkend="mfprintf">mfprintf</link>
             </member>
             <member>
                 <link linkend="msprintf">msprintf</link>
index fc78b82..fa67ec4 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) XXXX-2008 - INRIA
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
@@ -19,7 +19,7 @@
         <title>説明</title>
         <para>
             <literal>mprintf</literal> ,
-            <literal>msprintf</literal> , <literal>fprintf</literal>における各変換仕様.
+            <literal>msprintf</literal> , <literal>mfprintf</literal>における各変換仕様.
             <literal>format</literal> パラメータは以下のような構文を有します:
         </para>
         <itemizedlist>
@@ -28,7 +28,7 @@
             </listitem>
             <listitem>
                 <para>
-                    0個以上の <literal>options</literal>で, 
+                    0個以上の <literal>options</literal>で,
                     変換仕様の意味を修正します.
                     以下のリストに<literal>option</literal>文字とその意味を示します:
                 </para>
@@ -40,7 +40,7 @@
                         <para>+ : (+または -)を指定する符号変換の結果を開始.</para>
                     </listitem>
                     <listitem>
-                        <para>'空白' : 
+                        <para>'空白' :
                             符号変換後の最初の文字が符号ではない場合に結果の
                             前に空白文字を付加します.
                             (空白) および +オプションが共に指定された場合,
                             <literal>e, E, f, g,</literal> および <literal>G</literal>変換の場合,
                             小数点以下の値がない場合でも結果には常に小数点が含まれます.
                             <literal>g</literal> および
-                            <literal>G</literal> 変換の場合, 
+                            <literal>G</literal> 変換の場合,
                             末尾の0は結果から除かれません.
                         </para>
                     </listitem>
                     <listitem>
-                        <para>0 : 
+                        <para>0 :
                             <literal>d</literal>,
                             <literal>i</literal>, <literal>o</literal>, <literal>u</literal>,
                             <literal>x</literal>, <literal>X</literal>, <literal>e</literal>,
                             ヌル文字列となります.
                             前に付加する文字をゼロとしてフィールド幅を指定すると,
                             フィールド幅までの値では前にゼロを付加するパディングが
-                            行われます. 
+                            行われます.
                         </para>
                     </listitem>
                     <listitem>
     </refsection>
     <refsection>
         <title>例</title>
-        <programlisting role="example"><![CDATA[ 
+        <programlisting role="example"><![CDATA[
 mprintf('a string: %s\n', 'Scilab');
 mprintf('an integer: %d\n', 10);
 mprintf('an integer: %4d\n', 10);
@@ -328,7 +328,7 @@ mprintf('a character: %c\n', 'aaa');
                 <link linkend="mprintf">mprintf</link>
             </member>
             <member>
-                <link linkend="fprintf">fprintf</link>
+                <link linkend="mfprintf">mfprintf</link>
             </member>
             <member>
                 <link linkend="msprintf">msprintf</link>
index f8dd3fb..3081734 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) XXXX-2008 - INRIA
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
@@ -21,7 +21,7 @@
         <title>Descrição</title>
         <para>Cada especificação de conversão no parâmetro format de
             <literal>mprintf</literal> , <literal>msprintf</literal> ,
-            <literal>fprintf</literal> possui a seguinte sintaxe:
+            <literal>mfprintf</literal> possui a seguinte sintaxe:
         </para>
         <itemizedlist>
             <listitem>
                     <listitem>
                         <para>O número mínimo de dígitos a aparecerem nas conversões
                             <literal>d</literal>, <literal>u</literal>, <literal>o</literal>,
-                            <literal>x</literal>, ou <literal>X</literal> 
+                            <literal>x</literal>, ou <literal>X</literal>
                         </para>
                     </listitem>
                     <listitem>
                 <link linkend="mprintf">mprintf</link>
             </member>
             <member>
-                <link linkend="fprintf">fprintf</link>
+                <link linkend="mfprintf">mfprintf</link>
             </member>
             <member>
                 <link linkend="msprintf">msprintf</link>