Pages evstr, strcmp, strcmpi: misc typos + encoding fixed 09/19409/4
Samuel GOUGEON [Wed, 30 Aug 2017 16:37:54 +0000 (18:37 +0200)]
 Weirdly, encoding issues for (pt) files do no appear in the CR diff.
 They do in the pages as bad chars.

 No entry in CHANGES required.

Change-Id: I056e79b924c3e1827c59b2dd80b74af82d71a4be

scilab/modules/string/help/en_US/evstr.xml
scilab/modules/string/help/fr_FR/evstr.xml
scilab/modules/string/help/ja_JP/evstr.xml
scilab/modules/string/help/pt_BR/evstr.xml
scilab/modules/string/help/pt_BR/strcmp.xml
scilab/modules/string/help/pt_BR/strcmpi.xml
scilab/modules/string/help/ru_RU/evstr.xml

index 466bcfb..25565f6 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="evstr" xml:lang="en">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+        xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+        xmlns:scilab="http://www.scilab.org" xml:id="evstr" xml:lang="en">
     <refnamediv>
         <refname>evstr</refname>
         <refpurpose>evaluation of expressions</refpurpose>
         <para>
             <literal>Inf</literal> will be interpreted as <constant>%inf</constant>.
         </para>
-        <note>
-            Note that <varname>Z</varname> should not be composed of continuation marks (..).
-        </note>
+        <warning>
+            <varname>Z</varname> should not include any continuation marks (..).
+        </warning>
     </refsection>
     <refsection>
         <title>Examples</title>
-        <programlisting role="example">
-            a = 1; b = 2;
-            Z = ['a', 'b'] ;
-            evstr(Z)
+        <programlisting role="example"><![CDATA[
+a = 1; b = 2;
+Z = ['a', 'b'] ;
+evstr(Z)
 
-            Z = list(['%(1)','%(1)-%(2)'],['a+1','b+1']);
-            evstr(Z)
+Z = list(['%(1)','%(1)-%(2)'],['a+1','b+1']);
+evstr(Z)
 
-            evstr('NaN'), evstr('Inf')
+evstr('NaN'), evstr('Inf')
 
-            //The two return values version
-            [H, ierr] = evstr(Z) // no error
-            Z = ['a', 'b', 'c'] ;// the variable c is undefined
-            [H, ierr] = evstr(Z) // error 4: Undefined variable: c
-        </programlisting>
+//The two return values version
+[H, ierr] = evstr(Z) // no error
+Z = ['a', 'b', 'c'] ;// the variable c is undefined
+[H, ierr] = evstr(Z) // error 4: Undefined variable: c
+]]>    </programlisting>
     </refsection>
     <refsection role="see also">
         <title>See also</title>
index b4cbe54..454906c 100644 (file)
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="evstr" xml:lang="fr">
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+        xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+        xmlns:scilab="http://www.scilab.org" xml:id="evstr" xml:lang="fr">
     <refnamediv>
         <refname>evstr</refname>
         <refpurpose>évaluation d'une expression</refpurpose>
@@ -76,9 +92,9 @@
         </para>
         <para>Nan et Nan seront interpretés comme %nan.</para>
         <para>Inf sera interpreté comme %inf</para>
-        <note>
-            Note : <varname>Z</varname> ne doit pas comporter de marques de suite (..).
-        </note>
+        <warning>
+            <varname>Z</varname> ne doit comporter aucunes marques de suite (..).
+        </warning>
     </refsection>
     <refsection>
         <title>Exemples</title>
index 7be1d9a..3e55b69 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="evstr" xml:lang="ja">
-
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+               xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+               xmlns:scilab="http://www.scilab.org" xml:id="evstr" xml:lang="ja">
     <refnamediv>
-
         <refname>evstr</refname>
-
         <refpurpose>式を評価する</refpurpose>
-
     </refnamediv>
-
     <refsynopsisdiv>
-
         <title>呼び出し手順</title>
-
         <synopsis>
-
             H = evstr(Z)
-
             [H, ierr] = evstr(Z)
-
         </synopsis>
-
     </refsynopsisdiv>
-
     <refsection>
-
         <title>引数</title>
-
         <variablelist>
-
             <varlistentry>
-
                 <term>Z</term>
-
                 <listitem>
-
                     <para>
-
                         文字列の行列 <varname>M</varname> または
-
                         <code>list(M,Subexp)</code>
-
                     </para>
-
                     <variablelist>
-
                         <varlistentry>
-
                             <term>M</term>
-
                             <listitem>
-
                                 <para>文字列の行列</para>
-
                             </listitem>
-
                         </varlistentry>
-
                         <varlistentry>
-
                             <term>Subexp</term>
-
                             <listitem>
-
                                 <para>文字列のベクトル</para>
-
                             </listitem>
-
                         </varlistentry>
-
                     </variablelist>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>H</term>
-
                 <listitem>
-
                     <para>行列</para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>ierr</term>
-
                 <listitem>
-
                     <para>整数, エラーインジケータ</para>
-
                 </listitem>
-
             </varlistentry>
-
         </variablelist>
-
     </refsection>
-
     <refsection>
-
         <title>説明</title>
-
         <para>
-
             文字列の行列<varname>M</varname>を評価した結果を返します.
-
             行列の各要素は有効なScilab式を定義している必要があります.
-
         </para>
-
         <para>
-
             <varname>M</varname>式の評価でエラーが発生した場合,
-
             戻り値が1つの版,<code>H = evstr(M)</code>,では通常と同様に
-
             エラーを発生します.
-
             一方,戻り値が2つの版,<code>[H,ierr] = evstr(M)</code>,
-
             はエラーを発生しませんが,<varname>ierr</varname>にエラー番号が
-
             返されます.
-
         </para>
-
         <para>
-
             <varname>Z</varname> がリストの場合, <varname>Subexp</varname> は
-
             文字列のベクトルとなり,<varname>M</varname>を評価する前に
-
             評価されるsub_expressionsを定義します.
-
             これらのsub_expressionsは,<varname>M</varname>の中では
-
             <literal>%(k)</literal>として参照する必要があります.
-
             ただし,<literal>k</literal>は<varname>Subexp</varname>における
-
             sub-expressionのインデックスです.
-
         </para>
-
         <para>
-
             <code>evstr('a = 1')</code> は有効ではありません
-
             (代わりに<function>execstr</function>を使用してください).
-
         </para>
-
         <para>
             <literal>Nan</literal>, <literal>NaN</literal>
-
             は <constant>%nan</constant> と評価されます.
         </para>
-
         <para>
-
             <literal>Inf</literal> は <constant>%inf</constant> と評価されます.
-
         </para>
-
-        <note>
-
+        <warning>
             <varname>Z</varname> は,継続記号 (..)で分解できない
-
             ことに注意してください.
-
-        </note>
-
+        </warning>
     </refsection>
-
     <refsection>
-
         <title>例</title>
-
-        <programlisting role="example">
-
-            a = 1; b = 2;
-
-            Z = ['a', 'b'] ;
-
-            evstr(Z)
-
-
-
-            Z = list(['%(1)','%(1)-%(2)'],['a+1','b+1']);
-
-            evstr(Z)
-
-
-
-            evstr('NaN'), evstr('Inf')
-
-
-
-            //The two return values version
-
-            [H, ierr] = evstr(Z) // no error
-
-            Z = ['a', 'b', 'c'] ;// the variable c is undefined
-
-            [H, ierr] = evstr(Z) // error 4: Undefined variable: c
-
+        <programlisting role="example"><![CDATA[
+a = 1; b = 2;
+Z = ['a', 'b'] ;
+evstr(Z)
+
+Z = list(['%(1)','%(1)-%(2)'],['a+1','b+1']);
+evstr(Z)
+evstr('NaN'), evstr('Inf')
+
+//The two return values version
+[H, ierr] = evstr(Z) // no error
+Z = ['a', 'b', 'c'] ;// the variable c is undefined
+[H, ierr] = evstr(Z) // error 4: Undefined variable: c
+]]>
         </programlisting>
-
     </refsection>
-
     <refsection role="see also">
-
         <title>参照</title>
-
         <simplelist type="inline">
-
             <member>
-
                 <link linkend="execstr">execstr</link>
-
             </member>
-
         </simplelist>
-
     </refsection>
-
-</refentry>
-
+</refentry>
\ No newline at end of file
index 97e19c9..d546331 100644 (file)
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="evstr" xml:lang="pt">
+<?xml version="1.0" encoding="UTF-8"?>
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml"
+    xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+    xmlns:scilab="http://www.scilab.org" xml:id="evstr" xml:lang="pt">
     <refnamediv>
         <refname>evstr</refname>
         <refpurpose>avaliação de expressões</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>H=evstr(Z)
-            [H,ierr]=evstr(Z)
+        <synopsis>
+            H = evstr(Z)
+            [H,ierr] = evstr(Z)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
@@ -52,9 +56,9 @@
     </refsection>
     <refsection>
         <title>Descrição</title>
-        <para>Retorna o resultado da avaliação da matriz de strings
-            <literal>M</literal>. Cada elemento da matriz deve definir uma expressão
-            Scilab válida.
+        <para>
+            Retorna o resultado da avaliação da matriz de strings <literal>M</literal>.
+            Cada elemento da matriz deve definir uma expressão Scilab válida.
         </para>
         <para>
             Se a avaliação de <literal>M</literal> levar a um erro, a versão de
             mas retorna o número de erro em <literal>ierr</literal>.
         </para>
         <para>
-            Se <literal>Z</literal> é uma lista, <literal>Subexp </literal>é um
+            Se <literal>Z</literal> é uma lista, <literal>Subexp </literal> é um
             vetor de strings, que define subexpressões que são avaliadas antes da
             avaliação de <literal>M</literal>. Estas subexpressões devem ser referidas
             como <literal>%(k)</literal> em <literal>M</literal>, onde
             <literal>k</literal> é o índice da subexpressão em
             <literal>Subexp</literal>.
         </para>
-        <para>
-            evstr('a=1') não é válido (use <literal>execstr</literal> ao
-            invés).
-        </para>
+        <warning>
+            <varname>Z</varname> should not include any continuation marks (..).
+        </warning>
     </refsection>
     <refsection>
         <title>Exemplos</title>
-        <programlisting role="example">a = 1; b = 2; Z = ['a','b'] ; evstr(Z)
+        <programlisting role="example"><![CDATA[
+a = 1; b = 2; Z = ['a','b'] ;
+evstr(Z)
 
-            a = 1; b = 2; Z = list(['%(1)','%(1)-%(2)'],['a+1','b+1']);
-            evstr(Z)
+a = 1; b = 2; Z = list(['%(1)','%(1)-%(2)'],['a+1','b+1']);
+evstr(Z)
 
-            evstr('NaN'), evstr('Inf')
-        </programlisting>
+evstr('NaN'), evstr('Inf')
+]]>     </programlisting>
     </refsection>
     <refsection>
         <title>Ver Também</title>
index 4ae1506..7675d12 100644 (file)
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA -
  *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
+ * 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
+ * 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:ns4="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="strcmp" xml:lang="pt">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="strcmp" xml:lang="pt">
     <refnamediv>
         <refname>strcmp</refname>
         <refpurpose>compara strings</refpurpose>
@@ -40,7 +40,7 @@
             <varlistentry>
                 <term>'i'</term>
                 <listitem>
-                    <para>parâmetro para realização de stricmp caso independente, o
+                    <para>parâmetro para realização de stricmp (caso independente), o
                         valor padrão é 's'
                     </para>
                 </listitem>
@@ -80,10 +80,10 @@ strcmp(TXT1,TXT2,'i')
         <title>Ver Também</title>
         <simplelist type="inline">
             <member>
-                <link linkend="convstr">convstr</link>
+                <link linkend="strcat">strcat</link>
             </member>
             <member>
-                <link linkend="comparison">comparison</link>
+                <link linkend="strcmpi">strcmpi</link>
             </member>
         </simplelist>
     </refsection>
index 95b67a4..a32715b 100644 (file)
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA -
  *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
+ * 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
+ * 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:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="strcmpi" xml:lang="pt">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="strcmpi" xml:lang="pt">
     <refnamediv>
         <refname>strcmpi</refname>
         <refpurpose>
-            compara strings (caso independente)  <emphasis role="bold">This function is obsolete.</emphasis>
+          compara strings (caso independente) <emphasis role="bold">(Obsolete => strcmp(..,"i"))</emphasis>
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
@@ -59,7 +59,7 @@
         </para>
         <para>Um valor negativo indica o contrário.</para>
         <warning>
-            This function is obsolete. Please use <link linkend="strcmp">strcmp(s1,s1,"i")</link> instead.
+            This function is obsolete. Please use <literal>strcmp(s1,s2,"i")</literal> instead.
         </warning>
     </refsection>
     <refsection>
@@ -83,7 +83,7 @@ strcmpi(TXT1,'scilab')
         </simplelist>
     </refsection>
     <refsection>
-        <title>History</title>
+        <title>Histórico</title>
         <revhistory>
             <revision>
                 <revnumber>6.0</revnumber>
index aceeb53..ce090ed 100644 (file)
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="evstr" xml:lang="ru">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
+        xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+        xmlns:scilab="http://www.scilab.org" xml:id="evstr" xml:lang="ru">
     <refnamediv>
         <refname>evstr</refname>
         <refpurpose>вычисление выражений</refpurpose>
         <para>
             <literal>Inf</literal> будет интерпретироваться как <constant>%inf</constant>.
         </para>
+        <warning>
+            <varname>Z</varname> не должно содержать знаков продолжения (..).
+        </warning>
     </refsection>
     <refsection>
         <title>Примеры</title>
-        <programlisting role="example">
-            a = 1; b = 2;
-            Z = ['a', 'b'] ;
-            evstr(Z)
-            Z = list(['%(1)','%(1)-%(2)'],['a+1','b+1']);
-            evstr(Z)
+        <programlisting role="example"><![CDATA[
+a = 1; b = 2;
+Z = ['a', 'b'] ;
+evstr(Z)
+Z = list(['%(1)','%(1)-%(2)'],['a+1','b+1']);
+evstr(Z)
 
-            evstr('NaN'), evstr('Inf')
-            //Вариант с двумя возвращаемыми значениями
-            [H, ierr] = evstr(Z) // ошибки нет
-            Z = ['a', 'b', 'c'] ;// переменная c не определена
-            [H, ierr] = evstr(Z) // error 4: Неизвестная переменная: c
-        </programlisting>
+evstr('NaN'), evstr('Inf')
+//Вариант с двумя возвращаемыми значениями
+[H, ierr] = evstr(Z) // ошибки нет
+Z = ['a', 'b', 'c'] ;// переменная c не определена
+[H, ierr] = evstr(Z) // error 4: Неизвестная переменная: c
+]]>     </programlisting>
     </refsection>
     <refsection role="see also">
         <title>Смотрите также</title>