[doc] misc. fix / improvements 80/20780/14
Samuel GOUGEON [Sun, 3 Feb 2019 00:20:19 +0000 (01:20 +0100)]
 * sysconv: variablelist and ascii table replaced with true tables
 * ifftshift (fr): "along" missing in param. list => added
 * varn: varn([]) is now []
 * sparse: sparse([],[]) is now  "(0,0) zero sparse matrix"
 * datatip_properties: .text was not described.
    .parent, .visible, .data description improved.
 * flipdim: can be used as well for cells arrays.
 * dirname(): document its obsolescence
 * Xcos blocks pages: tabs, other typos, and small fixes.

Change-Id: I9d9c5bf0b37f0f68490f4414375da557007b00dd

59 files changed:
scilab/modules/elementary_functions/help/en_US/matrixmanipulation/flipdim.xml
scilab/modules/elementary_functions/help/en_US/signalprocessing/sysconv.xml
scilab/modules/elementary_functions/help/fr_FR/matrixmanipulation/flipdim.xml
scilab/modules/elementary_functions/help/ja_JP/matrixmanipulation/flipdim.xml
scilab/modules/elementary_functions/help/ja_JP/signalprocessing/sysconv.xml
scilab/modules/elementary_functions/help/pt_BR/signalprocessing/sysconv.xml
scilab/modules/elementary_functions/help/ru_RU/signalprocessing/sysconv.xml
scilab/modules/fileio/help/en_US/path_filename/dirname.xml
scilab/modules/fileio/help/ja_JP/path_filename/dirname.xml
scilab/modules/fileio/help/ru_RU/path_filename/dirname.xml
scilab/modules/graphics/help/en_US/datatips/datatip_properties.xml
scilab/modules/graphics/help/ja_JP/datatips/datatip_properties.xml
scilab/modules/graphics/help/pt_BR/datatips/datatip_properties.xml
scilab/modules/polynomials/help/en_US/varn.xml
scilab/modules/polynomials/help/fr_FR/varn.xml
scilab/modules/polynomials/help/ja_JP/varn.xml
scilab/modules/polynomials/help/pt_BR/varn.xml
scilab/modules/polynomials/help/ru_RU/varn.xml
scilab/modules/preferences/help/en_US/getPreferencesValue.xml
scilab/modules/preferences/help/ja_JP/getPreferencesValue.xml
scilab/modules/signal_processing/help/fr_FR/transforms/ifftshift.xml
scilab/modules/sparse/help/en_US/sparseconvert/sparse.xml
scilab/modules/sparse/help/ja_JP/sparseconvert/sparse.xml
scilab/modules/sparse/help/pt_BR/sparseconvert/sparse.xml
scilab/modules/xcos/help/en_US/palettes/Continuous_pal/INTEGRAL_m.xml
scilab/modules/xcos/help/en_US/palettes/Continuous_pal/PID.xml
scilab/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/AUTOMAT.xml
scilab/modules/xcos/help/en_US/palettes/Discrete_pal/DOLLAR_f.xml
scilab/modules/xcos/help/en_US/palettes/Discrete_pal/REGISTER.xml
scilab/modules/xcos/help/en_US/palettes/Electrical_pal/CCS.xml
scilab/modules/xcos/help/en_US/palettes/Electrical_pal/Capacitor.xml
scilab/modules/xcos/help/en_US/palettes/Electrical_pal/NPN.xml
scilab/modules/xcos/help/en_US/palettes/Events_pal/M_freq.xml
scilab/modules/xcos/help/en_US/palettes/Events_pal/freq_div.xml
scilab/modules/xcos/help/en_US/palettes/Lookuptables_pal/INTRPLBLK_f.xml
scilab/modules/xcos/help/fr_FR/palettes/Continuous_pal/INTEGRAL_f.xml
scilab/modules/xcos/help/fr_FR/palettes/Continuous_pal/INTEGRAL_m.xml
scilab/modules/xcos/help/fr_FR/palettes/Continuous_pal/PID.xml
scilab/modules/xcos/help/fr_FR/palettes/Discrete_pal/AA_Discrete_pal.xml
scilab/modules/xcos/help/fr_FR/palettes/Discrete_pal/DELAYV_f.xml
scilab/modules/xcos/help/fr_FR/palettes/Discrete_pal/DELAY_f.xml
scilab/modules/xcos/help/fr_FR/palettes/Discrete_pal/DOLLAR_f.xml
scilab/modules/xcos/help/fr_FR/palettes/Discrete_pal/REGISTER.xml
scilab/modules/xcos/help/fr_FR/palettes/Electrical_pal/Capacitor.xml
scilab/modules/xcos/help/fr_FR/palettes/Electrical_pal/CurrentSensor.xml
scilab/modules/xcos/help/fr_FR/palettes/Electrical_pal/NPN.xml
scilab/modules/xcos/help/fr_FR/palettes/Electrical_pal/PotentialSensor.xml
scilab/modules/xcos/help/fr_FR/palettes/Electrical_pal/VoltageSensor.xml
scilab/modules/xcos/help/fr_FR/palettes/Integer_pal/DFLIPFLOP.xml
scilab/modules/xcos/help/fr_FR/palettes/Integer_pal/EXTRACTBITS.xml
scilab/modules/xcos/help/fr_FR/palettes/Integer_pal/LOGIC.xml
scilab/modules/xcos/help/fr_FR/palettes/Integer_pal/SHIFT.xml
scilab/modules/xcos/help/fr_FR/palettes/Matrix_pal/CUMSUM.xml
scilab/modules/xcos/help/fr_FR/palettes/Portaction_pal/CLKOUTV_f.xml
scilab/modules/xcos/help/fr_FR/palettes/Portaction_pal/INIMPL_f.xml
scilab/modules/xcos/help/fr_FR/palettes/Signalprocessing_pal/SAMPHOLD_m.xml [new file with mode: 0644]
scilab/modules/xcos/help/fr_FR/palettes/Sources_pal/RFILE_f.xml
scilab/modules/xcos/help/ja_JP/palettes/Continuous_pal/INTEGRAL_m.xml
scilab/modules/xcos/help/ja_JP/palettes/Continuous_pal/PID.xml

index 1d3075d..e86744e 100644 (file)
@@ -20,7 +20,7 @@
     xmlns:scilab="http://www.scilab.org" xml:id="flipdim" xml:lang="en">
     <refnamediv>
         <refname>flipdim</refname>
-        <refpurpose>reverses the order of (blocks of) rows, columns, pages.. of a matrix or hypermatrix</refpurpose>
+        <refpurpose>reverses the order of (blocks of) rows, columns, pages.. of an array</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
@@ -36,7 +36,7 @@
                 <term>x, y</term>
                 <listitem>
                     <para>
-                        vectors, matrices, or hypermatrices of any regular data type.
+                        vectors, matrices, or hypermatrices of any regular data type, or cells array.
                         <varname>y</varname> gets the sizes of <varname>x</varname>.
                     </para>
                 </listitem>
@@ -65,8 +65,7 @@
         <title>Description</title>
         <para>
             <literal>flipdim(x, 1)</literal> inverts the order of
-            <emphasis role="italic">rows</emphasis> in the matrix or hypermatrix
-            <varname>x</varname>.
+            <emphasis role="italic">rows</emphasis> of <varname>x</varname>.
         </para>
         <para>
             <literal>flipdim(x, 2)</literal> inverts the order of
@@ -74,8 +73,7 @@
         </para>
         <para>
             <literal>flipdim(x, 3)</literal> inverts the order of
-            <emphasis role="italic">pages</emphasis> in the hypermatrix
-            <varname>x</varname>. Etc.
+            <emphasis role="italic">pages</emphasis> of <varname>x</varname>. Etc.
         </para>
         <para>
             The optional parameter <literal>blockSize</literal> allows splitting
index bee1efa..b2e3990 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="sysconv" 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="sysconv" xml:lang="en">
     <refnamediv>
         <refname>sysconv</refname>
         <refpurpose>system conversion</refpurpose>
             applied. Utility function for experts. The conversion rules in given in
             the following table.
         </para>
-        <variablelist>
-            <varlistentry>
-                <term>"c"</term>
-                <listitem>
-                    <para>continuous time system</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>"d"</term>
-                <listitem>
-                    <para>discrete time system</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>n</term>
-                <listitem>
-                    <para>sampled system with sampling period n</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>[]</term>
-                <listitem>
-                    <para>system with undefined time domain For mixed systems
-                        <literal>s1</literal> and <literal>s2</literal> are put in
-                        state-space representation.
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-        <programlisting><![CDATA[
- s1\s2 |    "c"     |     "d"     |      n2        |     []     |
- ---------------------------------------------------------------
- "c"   | nothing    |uncompatible | c2e(s1,n2)     |  c(s2)     |
- ---------------------------------------------------------------
- "d"   |uncompatible| nothing     | e(s1,n2)       |  d(s2)     |
- ---------------------------------------------------------------
- n1    | c2e(s2,n1) | e(s2,n1)    | n1<>n2 uncomp  |  e(s2,n1)  |
-       |            |             | n1=n2  nothing |            |
- ---------------------------------------------------------------
- []    | c(s1)      | d(s1)       | e(s1,n2)       |  nothing   |
- ---------------------------------------------------------------
-  ]]></programlisting>
+        <table>
+            <tr><th>"c"</th><td>: continuous time system.</td></tr>
+            <tr><th>"d"</th><td>: discrete time system.</td></tr>
+            <tr><th>n</th><td>: sampled system with sampling period n.</td></tr>
+            <tr valign="top">
+                <th>[ ]</th>
+                <td>: system with undefined time domain For mixed systems
+                      <literal>s1</literal> and <literal>s2</literal> are put in
+                      state-space representation.
+                </td>
+            </tr>
+        </table>
+        <para/>
+        <table border="1">
+            <tr>
+                <th>s1\s2</th><th>"c"</th><th>"d"</th><th>n2</th><th>[ ]</th>
+            </tr>
+            <tr>
+                <th>"c"</th>
+                <td>nothing</td>
+                <td>uncompatible</td>
+                <td>c2e(s1,n2)</td>
+                <td>c(s2)</td>
+            </tr>
+            <tr>
+                <th>"d"</th>
+                <td>uncompatible</td>
+                <td>nothing</td>
+                <td>e(s1,n2)</td>
+                <td>d(s2)</td>
+            </tr>
+            <tr>
+                <th>n1</th>
+                <td>c2e(s2,n1)</td>
+                <td>e(s2,n1)</td>
+                <td>n1&lt;>n2 uncomp<table/>n1=n2  nothing</td>
+                <td>e(s2,n1)</td>
+            </tr>
+            <tr>
+                <th>[ ]</th>
+                <td>c(s1)</td>
+                <td>d(s1)</td>
+                <td>e(s1,n2)</td>
+                <td>nothing</td>
+            </tr>
+        </table>
         <para>With the following meaning:</para>
-        <variablelist>
-            <varlistentry>
-                <term>n1,n2</term>
-                <listitem>
-                    <para>sampling period</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>c2e(s,n)</term>
-                <listitem>
-                    <para>the continuous-time system s is transformed into a sampled
-                        system with sampling period n.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>c(s)</term>
-                <listitem>
-                    <para>conversion to continuous (time domain is
-                        <literal>"c"</literal>)
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>d(s)</term>
-                <listitem>
-                    <para>conversion to discrete (time domain is
-                        <literal>"d"</literal>)
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>e(s,n)</term>
-                <listitem>
-                    <para>conversion to samples system with period
-                        <literal>n</literal>
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
+        <table>
+            <tr valign="top">
+                <th align="left">n1, n2</th>
+                <td>: sampling periods</td>
+            </tr>
+            <tr valign="top">
+                <th align="left">c2e(s,n)</th>
+                <td>: the continuous-time system s is transformed into a sampled
+                    system with sampling period n.
+                </td>
+            </tr>
+            <tr valign="top">
+                <th align="left">c(s)</th>
+                <td>: conversion to continuous (time domain is <literal>"c"</literal>)
+                </td>
+            </tr>
+            <tr valign="top">
+                <th align="left">d(s)</th>
+                <td>: conversion to discrete (time domain is <literal>"d"</literal>)
+                </td>
+            </tr>
+            <tr valign="top">
+                <th align="left">e(s,n)</th>
+                <td>: conversion to samples system with period <literal>n</literal>
+                </td>
+            </tr>
+        </table>
     </refsection>
     <refsection>
         <title>Examples</title>
index a02a533..3ace3f9 100644 (file)
@@ -21,7 +21,7 @@
     <refnamediv>
         <refname>flipdim</refname>
         <refpurpose>
-            inverse l'ordre des (blocs de) lignes, colonnes, pages.. d'une matrice ou hypermatrice
+            inverse l'ordre des (blocs de) lignes, colonnes, pages.. d'un tableau.
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
@@ -38,7 +38,8 @@
                 <term>x, y</term>
                 <listitem>
                     <para>
-                      scalaires, vecteurs, matrices, ou hypermatrices de n'importe quel type de données régulier.
+                      scalaires, vecteurs, matrices, ou hypermatrices de n'importe quel type de
+                      données régulier, ou tableau de cells.
                       <varname>y</varname> prend la taille de <varname>x</varname>.
                     </para>
                 </listitem>
@@ -67,8 +68,7 @@
         <title>Description</title>
         <para>
             <literal>flipdim(x, 1)</literal> inverse l'ordre des
-            <emphasis role="italic">lignes</emphasis> de la matrice ou hypermatrice
-            <varname>x</varname>.
+            <emphasis role="italic">lignes</emphasis> de <varname>x</varname>.
         </para>
         <para>
             <literal>flipdim(x, 2)</literal> inverse l'ordre des
@@ -76,8 +76,7 @@
         </para>
         <para>
             <literal>flipdim(x, 3)</literal> inverse l'ordre des
-            <emphasis role="italic">pages</emphasis> de l'hypermatrice
-            <varname>x</varname>. etc.
+            <emphasis role="italic">pages</emphasis> de <varname>x</varname>. etc.
         </para>
         <para>
             Le paramètre optionnel <literal>blockSize</literal> permet d'inverser l'ordre des
index 55f1e59..30c8b9e 100644 (file)
@@ -36,8 +36,9 @@
                 <term>x, y</term>
                 <listitem>
                     <para>
-                        ベクトル、行列、または任意の通常のデータ型のハイパーマトリックスを含む。
-                        <varname> y </varname>は<varname> x </varname>のサイズを取得します。
+                        ベクトル、行列、または任意の通常のデータ型のハイパーマトリックスを含む、
+                        or cells array.
+                        <varname> y </varname>は<varname> x </varname>のサイズを取得します.
                     </para>
                 </listitem>
             </varlistentry>
@@ -65,8 +66,7 @@
         <title>説明</title>
         <para>
             <literal>flipdim(x, 1)</literal> inverts the order of
-            <emphasis role="italic">rows</emphasis> in the matrix or hypermatrix
-            <varname>x</varname>.
+            <emphasis role="italic">rows</emphasis> of <varname>x</varname>.
         </para>
         <para>
             <literal>flipdim(x, 2)</literal> inverts the order of
@@ -74,8 +74,7 @@
         </para>
         <para>
             <literal>flipdim(x, 3)</literal> inverts the order of
-            <emphasis role="italic">pages</emphasis> in the hypermatrix
-            <varname>x</varname>. Etc.
+            <emphasis role="italic">pages</emphasis> of <varname>x</varname>. Etc.
         </para>
         <para>
             The optional parameter <literal>blockSize</literal> allows splitting
index 6d9cd94..67d06eb 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
  * 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="sysconv" xml:lang="ja">
+<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="sysconv" xml:lang="ja">
     <refnamediv>
         <refname>sysconv</refname>
         <refpurpose>システム変換</refpurpose>
             システムの相互接続処理を行うために共通の表現に変換します.
             変換規則は以下の表で指定されています.
         </para>
-        <variablelist>
-            <varlistentry>
-                <term>"c"</term>
-                <listitem>
-                    <para>連続時間システム</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>"d"</term>
-                <listitem>
-                    <para>離散時間システム</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>n</term>
-                <listitem>
-                    <para>サンプル周期nのサンプル化システム</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>[]</term>
-                <listitem>
-                    <para>未定義の時間領域を有するシステム.
-                        混合システムの場合,
-                        <literal>s1</literal> および <literal>s2</literal> は
-                        状態空間表現に変換されます.
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-        <programlisting role=""><![CDATA[
- s1\s2 |    "c"     |     "d"     |      n2        |     []     |
- ---------------------------------------------------------------
- "c"   | nothing    |uncompatible | c2e(s1,n2)     |  c(s2)     |
- ---------------------------------------------------------------
- "d"   |uncompatible| nothing     | e(s1,n2)       |  d(s2)     |
- ---------------------------------------------------------------
- n1    | c2e(s2,n1) | e(s2,n1)    | n1<>n2 uncomp  |  e(s2,n1)  |
-       |            |             | n1=n2  nothing |            |
- ---------------------------------------------------------------
- []    | c(s1)      | d(s1)       | e(s1,n2)       |  nothing   |
- ---------------------------------------------------------------
-  ]]></programlisting>
+        <table>
+            <tr><th>"c"</th><td>: 連続時間システム</td></tr>
+            <tr><th>"d"</th><td>: 離散時間システム</td></tr>
+            <tr><th>n</th><td>: サンプル周期nのサンプル化システム</td></tr>
+            <tr valign="top">
+                <th>[ ]</th>
+                <td>: 未定義の時間領域を有するシステム. 混合システムの場合,
+                    <literal>s1</literal> および <literal>s2</literal> は
+                    状態空間表現に変換されます.
+                </td>
+            </tr>
+        </table>
+        <para/>
+        <table border="1">
+            <tr>
+                <th>s1\s2</th><th>"c"</th><th>"d"</th><th>n2</th><th>[ ]</th>
+            </tr>
+            <tr>
+                <th>"c"</th>
+                <td>nothing</td>
+                <td>uncompatible</td>
+                <td>c2e(s1,n2)</td>
+                <td>c(s2)</td>
+            </tr>
+            <tr>
+                <th>"d"</th>
+                <td>uncompatible</td>
+                <td>nothing</td>
+                <td>e(s1,n2)</td>
+                <td>d(s2)</td>
+            </tr>
+            <tr>
+                <th>n1</th>
+                <td>c2e(s2,n1)</td>
+                <td>e(s2,n1)</td>
+                <td>n1&lt;>n2 uncomp<table/>n1=n2  nothing</td>
+                <td>e(s2,n1)</td>
+            </tr>
+            <tr>
+                <th>[ ]</th>
+                <td>c(s1)</td>
+                <td>d(s1)</td>
+                <td>e(s1,n2)</td>
+                <td>nothing</td>
+            </tr>
+        </table>
         <para>以下のような意味があります:</para>
-        <variablelist>
-            <varlistentry>
-                <term>n1,n2</term>
-                <listitem>
-                    <para>サンプリング周期</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>c2e(s,n)</term>
-                <listitem>
-                    <para>
-                        連続時間システム sをサンプリング周期nの
-                        離散システムに変換.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>c(s)</term>
-                <listitem>
-                    <para>連続システムに変換 (時間領域は
-                        <literal>"c"</literal>)
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>d(s)</term>
-                <listitem>
-                    <para>離散システムに変換 (時間領域は
-                        <literal>"d"</literal>)
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>e(s,n)</term>
-                <listitem>
-                    <para>
-                        周期<literal>n</literal>のサンプル化システムに変換
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
+        <table>
+            <tr valign="top">
+                <th align="left">n1, n2</th>
+                <td>: サンプリング周期</td>
+            </tr>
+            <tr valign="top">
+                <th align="left">c2e(s,n)</th>
+                <td>: 連続時間システム sをサンプリング周期nの 離散システムに変換.
+                </td>
+            </tr>
+            <tr valign="top">
+                <th align="left">c(s)</th>
+                <td>: 連続システムに変換 (時間領域は<literal>"c"</literal>)
+                </td>
+            </tr>
+            <tr valign="top">
+                <th align="left">d(s)</th>
+                <td>: 離散システムに変換 (時間領域は<literal>"d"</literal>)
+                </td>
+            </tr>
+            <tr valign="top">
+                <th align="left">e(s,n)</th>
+                <td>: 周期<literal>n</literal>のサンプル化システムに変換.
+                </td>
+            </tr>
+        </table>
     </refsection>
     <refsection>
         <title>例</title>
         <programlisting role="example"><![CDATA[
-s1=ssrand(1,1,2);
-s2=ss2tf(s1);
-[s1,s2]=sysconv(s1,s2);
+s1 = ssrand(1,1,2);
+s2 = ss2tf(s1);
+[s1,s2] = sysconv(s1,s2);
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
index cc7aa9a..931dc77 100644 (file)
@@ -1,4 +1,4 @@
-<?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) 2008 - INRIA
  * 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="sysconv" 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="sysconv" xml:lang="pt">
     <refnamediv>
         <refname>sysconv</refname>
-        <refpurpose>conversão de sistema</refpurpose>
+        <refpurpose>conversão de sistema</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
+        <title>Seqüência de Chamamento</title>
         <synopsis>[s1,s2]=sysconv(s1,s2)</synopsis>
     </refsynopsisdiv>
     <refsection>
-        <title>Parâmetros</title>
+        <title>Parâmetros</title>
         <variablelist>
             <varlistentry>
                 <term>s1,s2</term>
         </variablelist>
     </refsection>
     <refsection>
-        <title>Descrição</title>
+        <title>Descrição</title>
         <para>
             Converte <literal>s1</literal> e <literal>s2</literal> para
-            representação comum a fim de que operações de interconexão de sistemas
-            possam ser aplicadas. Função utilitária para peritos. A regra de conversão
-            é dada na seguinte tabela.
+            representação comum a fim de que operações de interconexão de sistemas
+            possam ser aplicadas. Função utilitária para peritos. A regra de conversão
+            é dada na seguinte tabela.
         </para>
-        <variablelist>
-            <varlistentry>
-                <term>"c"</term>
-                <listitem>
-                    <para>sistema de tempo contínuo</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>"d"</term>
-                <listitem>
-                    <para>sistema de tempo discreto </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>n</term>
-                <listitem>
-                    <para>sistema amostrado com período de amostragem n </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>[]</term>
-                <listitem>
-                    <para>sistema com domínio de tempo indefinido. Para sistemas mistos,
-                        s1 e s2 são postos em representação de estado-espaço.
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-        <programlisting><![CDATA[
- s1\s2  |   "c"     |     "d"     |      n2        |     []     |
- ---------------------------------------------------------------
- "c"   | nada       |incompatível | c2e(s1,n2)     |  c(s2)     |
- ---------------------------------------------------------------
- "d"   |incompatível| nada        | e(s1,n2)       |  d(s2)     |
- ---------------------------------------------------------------
- n1    | c2e(s2,n1) | e(s2,n1)    | n1<>n2 incomp  |  e(s2,n1)  |
-       |            |             | n1=n2  nada    |            |
- ---------------------------------------------------------------
- []    | c(s1)      | d(s1)       | e(s1,n2)       |  nada      |
- ---------------------------------------------------------------
- ]]></programlisting>
+        <table>
+            <tr><th>"c"</th><td>: sistema de tempo contínuo.</td></tr>
+            <tr><th>"d"</th><td>: sistema de tempo discreto.</td></tr>
+            <tr><th>n</th><td>: sistema amostrado com período de amostragem n.</td></tr>
+            <tr valign="top">
+                <th>[ ]</th>
+                <td>: sistema com domínio de tempo indefinido. Para sistemas mistos,
+                      s1 e s2 são postos em representação de estado-espaço.
+                </td>
+            </tr>
+        </table>
+        <para/>
+        <table border="1">
+            <tr>
+                <th>s1\s2</th><th>"c"</th><th>"d"</th><th>n2</th><th>[ ]</th>
+            </tr>
+            <tr>
+                <th>"c"</th>
+                <td>nada</td>
+                <td>incompatível</td>
+                <td>c2e(s1,n2)</td>
+                <td>c(s2)</td>
+            </tr>
+            <tr>
+                <th>"d"</th>
+                <td>incompatível</td>
+                <td>nada</td>
+                <td>e(s1,n2)</td>
+                <td>d(s2)</td>
+            </tr>
+            <tr>
+                <th>n1</th>
+                <td>c2e(s2,n1)</td>
+                <td>e(s2,n1)</td>
+                <td>n1&lt;>n2 incomp<table/>n1=n2  nada</td>
+                <td>e(s2,n1)</td>
+            </tr>
+            <tr>
+                <th>[ ]</th>
+                <td>c(s1)</td>
+                <td>d(s1)</td>
+                <td>e(s1,n2)</td>
+                <td>nada</td>
+            </tr>
+        </table>
         <para>Com o seguinte significado: </para>
-        <variablelist>
-            <varlistentry>
-                <term>n1,n2</term>
-                <listitem>
-                    <para>período de amostragem </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>c2e(s,n)</term>
-                <listitem>
-                    <para>o sistema de tempo contínuo s é transformado em um sistema
-                        amostrado com período de amostragem n.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>c(s)</term>
-                <listitem>
-                    <para>conversão para tempo contínuo (domínio de tempo é
-                        <literal>"c"</literal>)
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>d(s)</term>
-                <listitem>
-                    <para>conversão para tempo discreto (domínio de tempo é
-                        <literal>"d"</literal>)
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>e(s,n)</term>
-                <listitem>
-                    <para>conversão para sistema amostrado com período
-                        <literal>n</literal>
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
+        <table>
+            <tr valign="top">
+                <th align="left">n1, n2</th>
+                <td>: período de amostragem.</td>
+            </tr>
+            <tr valign="top">
+                <th align="left">c2e(s,n)</th>
+                <td>: o sistema de tempo contínuo s é transformado em um sistema
+                        amostrado com período de amostragem n.
+                </td>
+            </tr>
+            <tr valign="top">
+                <th align="left">c(s)</th>
+                <td>: conversão para tempo contínuo (domínio de tempo é <literal>"c"</literal>)
+                </td>
+            </tr>
+            <tr valign="top">
+                <th align="left">d(s)</th>
+                <td>: conversão para tempo discreto (domínio de tempo é <literal>"d"</literal>)
+                </td>
+            </tr>
+            <tr valign="top">
+                <th align="left">e(s,n)</th>
+                <td>: conversão para sistema amostrado com período <literal>n</literal>.
+                </td>
+            </tr>
+        </table>
     </refsection>
     <refsection>
         <title>Exemplos</title>
@@ -135,7 +129,7 @@ s2=ss2tf(s1);
  ]]></programlisting>
     </refsection>
     <refsection role="see also">
-        <title>Ver Também</title>
+        <title>Ver Também</title>
         <simplelist type="inline">
             <member>
                 <link linkend="syslin">syslin</link>
index bd1c02a..fc6d8d9 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="sysconv" 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="sysconv" xml:lang="ru">
     <refnamediv>
         <refname>sysconv</refname>
         <refpurpose>преобразование системы</refpurpose>
     <refsection>
         <title>Описание</title>
         <para>
-            Преобразует <literal>s1</literal> и <literal>s2</literal> в общее представление в том порядке, в котором могут быть применены операции взаимосвязи систем. Служебная функция, для экспертов. Правила преобразования даны в следующей таблице.
+            Преобразует <literal>s1</literal> и <literal>s2</literal> в общее представление в том порядке,
+            в котором могут быть применены операции взаимосвязи систем. Служебная функция, для экспертов.
+            Правила преобразования даны в следующей таблице.
         </para>
-        <variablelist>
-            <varlistentry>
-                <term>"c"</term>
-                <listitem>
-                    <para>система непрерывного времени</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>"d"</term>
-                <listitem>
-                    <para>система дискретного времени</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>n</term>
-                <listitem>
-                    <para>
-                        дискретная система с периодом дискретизации <literal>n</literal>
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>[]</term>
-                <listitem>
-                    <para>
-                        система с неопределённой временной областью. Для смешанных систем
-                        <literal>s1</literal> и <literal>s2</literal> представляются в пространстве состояний.
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-        <programlisting><![CDATA[
- s1\s2 |    "c"     |     "d"     |      n2        |     []     |
- ---------------------------------------------------------------
- "c"   |  ничего    |несовместимо | c2e(s1,n2)     |  c(s2)     |
- ---------------------------------------------------------------
- "d"   |несовместимо|   ничего    | e(s1,n2)       |  d(s2)     |
- ---------------------------------------------------------------
- n1    | c2e(s2,n1) | e(s2,n1)    | n1<>n2 несовм. |  e(s2,n1)  |
-       |            |             | n1=n2  ничего  |            |
- ---------------------------------------------------------------
- []    | c(s1)      | d(s1)       | e(s1,n2)       |   ничего   |
- ---------------------------------------------------------------
-  ]]></programlisting>
+        <table>
+            <tr><th>"c"</th><td>: система непрерывного времени.</td></tr>
+            <tr><th>"d"</th><td>: система дискретного времени.</td></tr>
+            <tr><th>n</th>
+                <td>: дискретная система с периодом дискретизации <literal>n</literal></td>
+            </tr>
+            <tr valign="top">
+                <th>[ ]</th>
+                <td>: система с неопределённой временной областью. Для смешанных систем
+                     <literal>s1</literal> и <literal>s2</literal>
+                     представляются в пространстве состояний.
+                </td>
+            </tr>
+        </table>
+        <para/>
+        <table border="1">
+            <tr>
+                <th>s1\s2</th><th>"c"</th><th>"d"</th><th>n2</th><th>[ ]</th>
+            </tr>
+            <tr>
+                <th>"c"</th>
+                <td>ничего</td>
+                <td>несовместимо</td>
+                <td>c2e(s1,n2)</td>
+                <td>c(s2)</td>
+            </tr>
+            <tr>
+                <th>"d"</th>
+                <td>несовместимо</td>
+                <td>ничего</td>
+                <td>e(s1,n2)</td>
+                <td>d(s2)</td>
+            </tr>
+            <tr>
+                <th>n1</th>
+                <td>c2e(s2,n1)</td>
+                <td>e(s2,n1)</td>
+                <td>n1&lt;>n2 несовм.<table/>n1=n2 ничего</td>
+                <td>e(s2,n1)</td>
+            </tr>
+            <tr>
+                <th>[ ]</th>
+                <td>c(s1)</td>
+                <td>d(s1)</td>
+                <td>e(s1,n2)</td>
+                <td>ничего</td>
+            </tr>
+        </table>
         <para>Приняты следующие обозначения:</para>
-        <variablelist>
-            <varlistentry>
-                <term>n1,n2</term>
-                <listitem>
-                    <para>период дискретизации</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>c2e(s,n)</term>
-                <listitem>
-                    <para>
-                        система непрерывного времени <literal>s</literal> преобразуется в дискретную систему с периодом дискретизации <literal>n</literal>.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>c(s)</term>
-                <listitem>
-                    <para>
-                        преобразование в непрерывную (временная область <literal>"c"</literal>)
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>d(s)</term>
-                <listitem>
-                    <para>
-                        преобразование в дискретную (временная область <literal>"d"</literal>)
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>e(s,n)</term>
-                <listitem>
-                    <para>
-                        преобразование в дискретную систему с периодом <literal>n</literal>
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
+        <table>
+            <tr valign="top">
+                <th align="left">n1, n2</th>
+                <td>: период дискретизации.</td>
+            </tr>
+            <tr valign="top">
+                <th align="left">c2e(s,n)</th>
+                <td>: система непрерывного времени <literal>s</literal> преобразуется в дискретную
+                      систему с периодом дискретизации <literal>n</literal>.
+                </td>
+            </tr>
+            <tr valign="top">
+                <th align="left">c(s)</th>
+                <td>: преобразование в непрерывную (временная область <literal>"c"</literal>)
+                </td>
+            </tr>
+            <tr valign="top">
+                <th align="left">d(s)</th>
+                <td>: преобразование в дискретную (временная область <literal>"d"</literal>)
+                </td>
+            </tr>
+            <tr valign="top">
+                <th align="left">e(s,n)</th>
+                <td>: преобразование в дискретную систему с периодом <literal>n</literal>.
+                </td>
+            </tr>
+        </table>
     </refsection>
     <refsection>
         <title>Примеры</title>
index 90fe1f8..13d559f 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:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="dirname">
+<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="en" xml:id="dirname">
     <refnamediv>
         <refname>dirname</refname>
-        <refpurpose>gets directory from filenames</refpurpose>
+        <refpurpose>gets directory from filenames <emphasis role="bold">(obsolete)</emphasis></refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
     </refsection>
     <refsection>
         <title>Description</title>
+        <warning>
+          <literal>dirname(…)</literal> is obsolete and will be removed from Scilab 6.1.x.
+          Please use <literal>fileparts(…)</literal> instead.
+        </warning>
         <para>
             <function>dirname</function> returns the directory paths of the file entries
             given in <varname>files</varname>.
@@ -107,6 +114,9 @@ dirs=dirname(['SCI/etc/scilab.start', 'SCI/etc/scilab.quit'])
         <title>See also</title>
         <simplelist type="inline">
             <member>
+                <link linkend="fileparts">fileparts</link>
+            </member>
+            <member>
                 <link linkend="basename">basename</link>
             </member>
             <member>
@@ -117,4 +127,16 @@ dirs=dirname(['SCI/etc/scilab.start', 'SCI/etc/scilab.quit'])
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0.2</revnumber>
+                <revdescription>
+                    dirname() is tagged obsolete, to be removed from Scilab 6.1.x.
+                    fileparts() replaces it.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 21804e8..cac37b5 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: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="dirname">
+<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="dirname">
     <refnamediv>
         <refname>dirname</refname>
-        <refpurpose>ファイル名からディレクトリを得る</refpurpose>
+        <refpurpose>ファイル名からディレクトリを得る <emphasis role="bold">(obsolete)</emphasis></refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
     </refsection>
     <refsection>
         <title>説明</title>
+        <warning>
+          <literal>dirname(…)</literal> is obsolete and will be removed from Scilab 6.1.x.
+          Please use <literal>fileparts(…)</literal> instead.
+        </warning>
         <para>
             <literal>dirname</literal> は <literal>files</literal> で指定したファイルエントリの
             ディレクトリ名を返します.
@@ -81,6 +88,9 @@ dirs=dirname('SCI/modules\fileio/macros/poo.sci.k')
         <title>参照</title>
         <simplelist type="inline">
             <member>
+                <link linkend="fileparts">fileparts</link>
+            </member>
+            <member>
                 <link linkend="basename">basename</link>
             </member>
             <member>
@@ -91,4 +101,16 @@ dirs=dirname('SCI/modules\fileio/macros/poo.sci.k')
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>履歴</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0.2</revnumber>
+                <revdescription>
+                    dirname() is tagged obsolete, to be removed from Scilab 6.1.x.
+                    fileparts() replaces it.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 872c7fb..4995f4a 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:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ru" xml:id="dirname">
+<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="ru" xml:id="dirname">
     <refnamediv>
         <refname>dirname</refname>
-        <refpurpose>получает имя директории из имён файлов</refpurpose>
+        <refpurpose>
+           получает имя директории из имён файлов <emphasis role="bold">(obsolete)</emphasis>
+        </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
     </refsection>
     <refsection>
         <title>Описание</title>
+        <warning>
+          <literal>dirname(…)</literal> is obsolete and will be removed from Scilab 6.1.x.
+          Please use <literal>fileparts(…)</literal> instead.
+        </warning>
         <para>
             Функция <function>dirname</function> возвращает путь директории, составленный
             из файлов, указанных в <varname>files</varname>.
@@ -104,6 +113,9 @@ dirs=dirname(['SCI/etc/scilab.start', 'SCI/etc/scilab.quit'])
         <title>Смотрите также</title>
         <simplelist type="inline">
             <member>
+                <link linkend="fileparts">fileparts</link>
+            </member>
+            <member>
                 <link linkend="basename">basename</link>
             </member>
             <member>
@@ -114,5 +126,17 @@ dirs=dirname(['SCI/etc/scilab.start', 'SCI/etc/scilab.quit'])
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>История</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0.2</revnumber>
+                <revdescription>
+                    dirname() is tagged obsolete, to be removed from Scilab 6.1.x.
+                    fileparts() replaces it.
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
 
index c0d4c2b..198af77 100644 (file)
             <varlistentry>
                 <term>parent: </term>
                 <listitem>
-                    <para>See
-                        <literal>
-                            <link linkend="polyline_properties">polyline_properties</link>
-                        </literal>
-                        help page.
+                    <para>
+                        handle of the curve the datatip is plugged on.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>children: </term>
                 <listitem>
-                    <para>See
-                        <literal>
-                            <link linkend="polyline_properties">polyline_properties</link>
-                        </literal>
-                        help page.
-                    </para>
+                    <para>unused.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>visible: </term>
                 <listitem>
-                    <para>See
-                        <literal>
-                            <link linkend="polyline_properties">polyline_properties</link>
-                        </literal>
-                        help page.
+                    <para>"on": the datatip is displayable according to the
+                            <literal>parent.datatip_display_mode</literal> setting.
+                    </para>
+                    <para>"off": the datatip display is canceled anyway.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>data: </term>
                 <listitem>
-                    <para>See
-                        <literal>
-                            <link linkend="polyline_properties">polyline_properties</link>
-                        </literal>
-                        help page.
+                    <para>
+                        Cartesian coordinates of the datatip's anchor on its curve, in data scales.
+                        For curves in special not-cartesian grids (after polarplot(), sgrid(), etc),
+                        <varname>.data</varname> contains the raw equivalent cartesian coordinates.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>text: </term>
+                <listitem>
+                    <para>
+                        Matrix of texts to be displayed (as a matrix) in the datatip label.
+                        Leading and trailing spaces are all trimmed. In each cell,
+                        the text is centered.
                     </para>
                 </listitem>
             </varlistentry>
                 <revremark>
                    <itemizedlist>
                      <listitem>
-                       <para><literal>.z_component</literal> is removed.</para>
-                     </listitem>
-                     <listitem>
-                       <para>New <literal>.display_components</literal> property.</para>
+                       <literal>.z_component</literal> is removed.
                      </listitem>
-                       <para>New <literal>.detached_position</literal> property.</para>
                      <listitem>
+                       New <literal>.display_components</literal> and
+                       <literal>.detached_position</literal> properties.
                      </listitem>
                    </itemizedlist>
                 </revremark>
index 890f1de..8eb28e8 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: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="datatip_properties">
-
     <refnamediv>
-
         <refname>datatipプロパティ</refname>
-
         <refpurpose>datatipエンティティプロパティの説明
-
         </refpurpose>
-
     </refnamediv>
-
     <refsection>
-
         <title>説明</title>
-
         <para>datatipエンティティはグラフィックエンティティ階層の葉です.
-
             このエンティティはdatatipのパラメータを定義します.
-
         </para>
-
         <variablelist>
-
             <varlistentry>
-
                 <term>parent: </term>
-
                 <listitem>
-
                     <para>
-
-                        <literal>
-
-                            <link linkend="polyline_properties">polyline_properties</link>
-
-                        </literal>
-
-                        ヘルプページを参照.
-
+                        handle of the curve the datatip is plugged on.
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>children: </term>
-
                 <listitem>
-
-                    <para>
-
-                        <literal>
-
-                            <link linkend="polyline_properties">polyline_properties</link>
-
-                        </literal>
-
-                        ヘルプページを参照.
-
-                    </para>
-
+                    <para>unused.</para>
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>visible: </term>
-
                 <listitem>
-
-                    <para>
-
-                        <literal>
-
-                            <link linkend="polyline_properties">polyline_properties</link>
-
-                        </literal>
-
-                        ヘルプページを参照.
-
+                    <para>"on": the datatip is displayable according to the
+                            <literal>parent.datatip_display_mode</literal> setting.
+                    </para>
+                    <para>"off": the datatip display is canceled anyway.
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>data: </term>
-
                 <listitem>
-
                     <para>
-
-                        <literal>
-
-                            <link linkend="polyline_properties">polyline_properties</link>
-
-                        </literal>
-
-                        ヘルプページを参照.
-
+                        Cartesian coordinates of the datatip's anchor on its curve, in data scales.
+                        For curves in special not-cartesian grids (after polarplot(), sgrid(), etc),
+                        <varname>.data</varname> contains the raw equivalent cartesian coordinates.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>text: </term>
+                <listitem>
+                    <para>
+                        Matrix of texts to be displayed (as a matrix) in the datatip label.
+                        Leading and trailing spaces are all trimmed. In each cell,
+                        the text is centered.
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>interp_mode: </term>
-
                 <listitem>
-
                     <para>
-
                         このフィールドはtipの位置の補間モードを指定します.
-
                         この値は <literal>"on" </literal> (格子点間で補間を行う)または
-
                         <literal>"off" </literal> (tipsは格子点にのみ配置可能)とします.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>box_mode: </term>
-
                 <listitem>
-
                     <para>
-
                         このフィールドはdatatipの<literal>box_mode</literal>プロパティの
-
                         デフォルト値を表します.
-
                         この値は,
-
                         <literal>"on" </literal>(箱を描画) または
-
                         <literal>"off"</literal> (箱を描画しない)とします.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>label_mode: </term>
-
                 <listitem>
-
                     <para>
-
                         このフィールドはdatatipの<literal>label_mode</literal>プロパティの
-
                         デフォルト値を表します. この値は,
-
                         <literal>"on" </literal>(ラベルを描画) または
-
                         <literal>"off"</literal> (ラベルを描画しない)とします.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>display_components: </term>
-
                 <listitem>
                     <para>
                         This field controls which components are displayed. Its default value is
                       The components are drawn in the order they are found in the string.
                     </para>
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>display_function: </term>
-
                 <listitem>
-
                     <para>
-
                         <literal>
-
                             <link linkend="polyline_properties">polyline_properties</link>
-
                         </literal>
-
                         のヘルプページを参照.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
            <varlistentry>
-
                 <term>orientation: </term>
-
                 <listitem>
-
                     <para>
-
                         このフィールドは,ポリラインの点に関するテキストボックスの位置を指定します.
-
                         指定可能な値は 0, 1, 2 または 3 です.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>auto_orientation: </term>
-
                 <listitem>
-
                     <para>
-
                         このフィールドはdatatipの<literal>auto_orientation</literal>プロパティの
-
                         デフォルト値を表します. この値は,
-
                         <literal>"on" </literal>(自動的に向きを設定) または
-
                         <literal>"off"</literal> (自動的に向きを設定しない)とします.
-
                         <literal>"off"</literal>の場合については,<literal>orientation</literal>
-
                         プロパティを参照ください.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
                 <term>detached_position: </term>
                 <listitem>
                     </para>
                 </listitem>
             </varlistentry>
-
             <varlistentry>
-
                 <term>font_foreground: </term>
-
                 <listitem>
-
                     <para>
-
                         このフィールドは,<literal>font_foreground</literal>プロパティのデフォルト値を有します.
-
                         この値は(カレントのカラーマップに関する)色添字とします.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>foreground: </term>
-
                 <listitem>
-
                     <para>
-
                         このフィールドは,箱を描画する際に使用される<literal>foreground</literal>
-
                         プロパティのデフォルト値を有します.
-
                         この値は(カレントのカラーマップに関する)色添字とします.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>background: </term>
-
                 <listitem>
-
                     <para>
-
                         <literal>
-
                             <link linkend="polyline_properties">polyline_properties</link>
-
                         </literal>
-
                         のヘルプページを参照.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>mark_mode: </term>
-
                 <listitem>
-
                     <para>
-
                         <literal>
-
                             <link linkend="polyline_properties">polyline_properties</link>
-
                         </literal>
-
                         のヘルプページを参照.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>mark_style: </term>
-
                 <listitem>
-
                     <para>
-
                         <literal>
-
                             <link linkend="polyline_properties">polyline_properties</link>
-
                         </literal>
-
                         のヘルプページを参照.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>mark_size_unit: </term>
-
                 <listitem>
-
                     <para>
-
                         <literal>
-
                             <link linkend="polyline_properties">polyline_properties</link>
-
                         </literal>
-
                         のヘルプページを参照.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>mark_size: </term>
-
                 <listitem>
-
                     <para>
-
                         <literal>
-
                             <link linkend="polyline_properties">polyline_properties</link>
-
                         </literal>
-
                         のヘルプページを参照.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>mark_foreground: </term>
-
                 <listitem>
-
                     <para>
-
                         <literal>
-
                             <link linkend="polyline_properties">polyline_properties</link>
-
                         </literal>
-
                         のヘルプページを参照.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>mark_background: </term>
-
                 <listitem>
-
                     <para>
-
                         <literal>
-
                             <link linkend="polyline_properties">polyline_properties</link>
-
                         </literal>
-
                         のヘルプページを参照.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>user_data: </term>
-
                 <listitem>
-
                     <para>
-
                         <literal>
-
                             <link linkend="polyline_properties">polyline_properties</link>
-
                         </literal>
-
                         のヘルプページを参照.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>tag: </term>
-
                 <listitem>
-
                     <para>
-
                         このフィールドは一般にコントロールを識別する際に使用される
-
                         文字列を有します.
-
                         <literal>
-
                             <link linkend="figure_properties">figure_properties</link>
-
                         </literal>
-
                         のヘルプページを参照.
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
         </variablelist>
-
     </refsection>
-
     <refsection role="see also">
-
         <title>参照</title>
-
         <simplelist type="inline">
-
             <member>
-
                 <link linkend="polyline_properties">polyline_properties</link>
-
             </member>
-
             <member>
-
                 <link linkend="figure_properties">figure_properties</link>
-
             </member>
-
             <member>
-
                 <link linkend="graphics_entities">graphics_entities</link>
-
             </member>
-
         </simplelist>
-
     </refsection>
     <refsection>
         <title>History</title>
                 <revremark>
                    <itemizedlist>
                      <listitem>
-                       <para><literal>.z_component</literal> is removed.</para>
-                     </listitem>
-                     <listitem>
-                       <para>New <literal>.display_components</literal> property.</para>
+                       <literal>.z_component</literal> is removed.
                      </listitem>
-                       <para>New <literal>.detached_position</literal> property.</para>
                      <listitem>
+                       New <literal>.display_components</literal> and
+                       <literal>.detached_position</literal> properties.
                      </listitem>
                    </itemizedlist>
                 </revremark>
             </revision>
         </revhistory>
     </refsection>
-</refentry>
-
+</refentry>
\ No newline at end of file
index 4684d23..31baa57 100644 (file)
             <varlistentry>
                 <term>parent: </term>
                 <listitem>
-                    <para>Veja
-                        <literal>
-                            <link linkend="polyline_properties">polyline_properties</link>
-                        </literal>
-                        nas páginas de ajuda.
+                    <para>
+                        handle of the curve the datatip is plugged on.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>children: </term>
                 <listitem>
-                    <para>Veja
-                        <literal>
-                            <link linkend="polyline_properties">polyline_properties</link>
-                        </literal>
-                        nas páginas de ajuda.
-                    </para>
+                    <para>unused.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>visible: </term>
                 <listitem>
-                    <para>Veja
-                        <literal>
-                            <link linkend="polyline_properties">polyline_properties</link>
-                        </literal>
-                        nas páginas de ajuda.
+                    <para>"on": the datatip is displayable according to the
+                            <literal>parent.datatip_display_mode</literal> setting.
+                    </para>
+                    <para>"off": the datatip display is canceled anyway.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>data: </term>
                 <listitem>
-                    <para>Veja
-                        <literal>
-                            <link linkend="polyline_properties">polyline_properties</link>
-                        </literal>
-                        nas páginas de ajuda.
+                    <para>
+                        Cartesian coordinates of the datatip's anchor on its curve, in data scales.
+                        For curves in special not-cartesian grids (after polarplot(), sgrid(), etc),
+                        <varname>.data</varname> contains the raw equivalent cartesian coordinates.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>text: </term>
+                <listitem>
+                    <para>
+                        Matrix of texts to be displayed (as a matrix) in the datatip label.
+                        Leading and trailing spaces are all trimmed. In each cell,
+                        the text is centered.
                     </para>
                 </listitem>
             </varlistentry>
                 <revremark>
                    <itemizedlist>
                      <listitem>
-                       <para><literal>.z_component</literal> is removed.</para>
-                     </listitem>
-                     <listitem>
-                       <para>New <literal>.display_components</literal> property.</para>
+                       <literal>.z_component</literal> is removed.
                      </listitem>
-                       <para>New <literal>.detached_position</literal> property.</para>
                      <listitem>
+                       New <literal>.display_components</literal> and
+                       <literal>.detached_position</literal> properties.
                      </listitem>
                    </itemizedlist>
                 </revremark>
index 70b47e6..3346684 100644 (file)
@@ -2,9 +2,8 @@
 <!--
 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 * Copyright (C) - INRIA
-* Copyright (C) 2018 - Samuel GOUGEON
-*
 * Copyright (C) 2012 - 2016 - Scilab Enterprises
+* Copyright (C) 2018 - Samuel GOUGEON
 *
 * 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.
@@ -71,6 +70,9 @@
             <literal>varn(p,'s')</literal> returns a polynomial matrix with same coefficients
             as <literal>p</literal> but with <literal>'s'</literal> as symbolic variable (change of variable name).
         </para>
+        <para>
+            <literal>varn([])</literal> yields [].
+        </para>
     </refsection>
     <refsection>
         <title>Examples</title>
@@ -164,10 +166,15 @@ fx == f
             <revision>
                 <revnumber>6.0.0</revnumber>
                 <revremark>
-                    <para>
-                        The name of the symbolic variable is no longer limited to 4 characters.
-                        It can now include extended UTF-8 characters.
-                    </para>
+                    <itemizedlist>
+                        <listitem>
+                            The name of the symbolic variable is no longer limited to 4 characters.
+                            It can now include extended UTF-8 characters.
+                        </listitem>
+                        <listitem>
+                            varn([]) now returns [] instead of routing to %s_varn().
+                        </listitem>
+                    </itemizedlist>
                 </revremark>
             </revision>
         </revhistory>
index 843138f..8bf102c 100644 (file)
@@ -2,9 +2,8 @@
 <!--
 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 * Copyright (C) - INRIA
-* Copyright (C) 2018 - Samuel GOUGEON
-*
 * Copyright (C) 2012 - 2016 - Scilab Enterprises
+* Copyright (C) 2018 - Samuel GOUGEON
 *
 * 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.
@@ -73,6 +72,9 @@
             <literal>varn(p,'s')</literal> renvoie une matrice polynomiale égale à
             <literal>p</literal> mais avec <literal>'s'</literal> comme indéterminée.
         </para>
+        <para>
+            <literal>varn([])</literal> produit [].
+        </para>
     </refsection>
     <refsection>
         <title>Exemples</title>
@@ -166,9 +168,16 @@ fx == f
             <revision>
                 <revnumber>6.0.0</revnumber>
                 <revremark>
+                    <itemizedlist>
+                        <listitem>
+                            Le nom de la variable symbolique n'est plus limité à 4 caractères.
+                            Il peut désormais inclure des caractères UTF-8 étendus.
+                        </listitem>
+                        <listitem>
+                            varn([]) produit désormais [] au lieu de diriger vers %s_varn().
+                        </listitem>
+                    </itemizedlist>
                     <para>
-                        Le nom de la variable symbolique n'est plus limité à 4 caractères.
-                        Il peut désormais inclure des caractères UTF-8 étendus.
                     </para>
                 </revremark>
             </revision>
index 2baa154..2ad3eeb 100644 (file)
@@ -2,9 +2,8 @@
 <!--
 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 * Copyright (C) - INRIA
-* Copyright (C) 2018 - Samuel GOUGEON
-*
 * Copyright (C) 2012 - 2016 - Scilab Enterprises
+* Copyright (C) 2018 - Samuel GOUGEON
 *
 * 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.
@@ -72,6 +71,9 @@
             同じ係数を有し,<literal>'s'</literal>を記号変数とする
             多項式行列を返します(変数名の変更).
         </para>
+        <para>
+            <literal>varn([])</literal> yields [].
+        </para>
     </refsection>
     <refsection>
         <title>例</title>
@@ -165,10 +167,15 @@ fx == f
             <revision>
                 <revnumber>6.0.0</revnumber>
                 <revremark>
-                    <para>
-                        シンボリック変数の名前はもはや4文字に制限されていません。
-                        拡張されたUTF-8文字を追加できるようになりました。
-                    </para>
+                    <itemizedlist>
+                        <listitem>
+                            シンボリック変数の名前はもはや4文字に制限されていません。
+                            拡張されたUTF-8文字を追加できるようになりました。
+                        </listitem>
+                        <listitem>
+                            varn([]) now returns [] instead of routing to %s_varn().
+                        </listitem>
+                    </itemizedlist>
                 </revremark>
             </revision>
         </revhistory>
index c107bca..8e094df 100644 (file)
@@ -2,9 +2,8 @@
 <!--
 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 * Copyright (C) - INRIA
-* Copyright (C) 2018 - Samuel GOUGEON
-*
 * Copyright (C) 2012 - 2016 - Scilab Enterprises
+* Copyright (C) 2018 - Samuel GOUGEON
 *
 * 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.
@@ -75,6 +74,9 @@
             </literal>
             como variável simbólica (mudança do nome de variável).
         </para>
+        <para>
+            <literal>varn([])</literal> yields [].
+        </para>
     </refsection>
     <refsection>
         <title>Exemplos</title>
@@ -168,10 +170,15 @@ fx == f
             <revision>
                 <revnumber>6.0.0</revnumber>
                 <revremark>
-                    <para>
-                        O nome da variável simbólica não está mais limitado a 4 caracteres.
-                        Agora ele pode incluir caracteres UTF-8 estendidos.
-                    </para>
+                    <itemizedlist>
+                        <listitem>
+                            O nome da variável simbólica não está mais limitado a 4 caracteres.
+                            Agora ele pode incluir caracteres UTF-8 estendidos.
+                        </listitem>
+                        <listitem>
+                            varn([]) now returns [] instead of routing to %s_varn().
+                        </listitem>
+                    </itemizedlist>
                 </revremark>
             </revision>
         </revhistory>
index 2c59c67..647de11 100644 (file)
@@ -2,9 +2,8 @@
 <!--
 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 * Copyright (C) - INRIA
-* Copyright (C) 2018 - Samuel GOUGEON
-*
 * Copyright (C) 2012 - 2016 - Scilab Enterprises
+* Copyright (C) 2018 - Samuel GOUGEON
 *
 * 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.
@@ -74,6 +73,9 @@
             что и <literal>p</literal>, но с <literal>'s'</literal> в качестве символической
             переменой (смена имени переменной).
         </para>
+        <para>
+          <literal>varn([])</literal> даёт <literal>[]</literal>.
+        </para>
     </refsection>
     <refsection>
         <title>Примеры</title>
@@ -167,10 +169,15 @@ fx == f
             <revision>
                 <revnumber>6.0.0</revnumber>
                 <revremark>
-                    <para>
-                        Имя символьной переменной больше не ограничено 4 символами.
-                        Теперь он может включать расширенные символы UTF-8.
-                    </para>
+                    <itemizedlist>
+                        <listitem>
+                            Имя символьной переменной больше не ограничено 4 символами.
+                            Теперь он может включать расширенные символы UTF-8.
+                        </listitem>
+                        <listitem>
+                            varn([]) теперь возвращает [] вместо обращения к %s_varn().
+                        </listitem>
+                    </itemizedlist>
                 </revremark>
             </revision>
         </revhistory>
index c2015bd..0bf3c96 100644 (file)
         <title>Description</title>
         <warning>
             <literal>getPreferencesValue()</literal> is obsolete. It is cloned into
-            <code>xmlGetValues()</code>. It will be removed from Scilab 6.2.
+            <code>xmlGetValues()</code>. It will be removed from Scilab 6.1.x
         </warning>
         <para>
             When an XML handle returned by <code>xmlRead(..)</code> is provided as
@@ -276,7 +276,7 @@ C:\Path\to\another\working\dir2\clf.sci
             <revision>
                 <revnumber>6.0.2</revnumber>
                 <revdescription>getPreferencesValue() is cloned into xmlGetValues(). It is
-                    declared obsolete and will be removed from Scilab 6.2.
+                    declared obsolete and will be removed from Scilab 6.1.x
                 </revdescription>
             </revision>
         </revhistory>
index 0096c2e..6813d4a 100644 (file)
@@ -57,7 +57,7 @@
         <title>説明</title>
         <warning>
             <literal>getPreferencesValue()</literal> is obsolete. It is cloned into
-            <code>xmlGetValues()</code>. It will be removed from Scilab 6.2.
+            <code>xmlGetValues()</code>. It will be removed from Scilab 6.1.x
         </warning>
         <para>
             設定ファイル(<literal>SCIHOME+'/XConfiguration.xml'</literal>)の
@@ -146,7 +146,7 @@ getPreferencesValue("//web/body/proxy", ["enabled", "host", "port"]);
             <revision>
                 <revnumber>6.0.2</revnumber>
                 <revdescription>getPreferencesValue() is cloned into xmlGetValues(). It is
-                    declared obsolete and will be removed from Scilab 6.2.
+                    declared obsolete and will be removed from Scilab 6.1.x
                 </revdescription>
             </revision>
         </revhistory>
index b064cd4..e33e6c3 100644 (file)
                     </para>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>along</term>
+                <listitem>
+                    <para>
+                        1 | "r" | 2 | "c" | 0&lt;along&lt;=ndims(x): direction selon laquelle
+                        les moitiés sont commutées.
+                    </para>
+                </listitem>
+            </varlistentry>
         </variablelist>
     </refsection>
     <refsection>
index 4f712bc..59f944d 100644 (file)
             matrix dimensions are the max value of <literal>ij(:,1)</literal> and <literal>ij(:,2)</literal>
             respectively.
         </para>
-        <warning>For the building syntaxes, if several values are given for a same
-            <varname>ij</varname> position, the sum of theses values is assigned.
+        <warning>
+            <itemizedlist>
+              <listitem>
+                  For the building syntaxes, if several values are given for a same
+                  <varname>ij</varname> position, the sum of theses values is assigned.
+              </listitem>
+              <listitem>
+                <literal>sparse([],[])</literal> yields the <literal>(0, 0) zero sparse matrix</literal>,
+                with <literal>sparse([],[]) ~= []</literal>.
+              </listitem>
+            </itemizedlist>
         </warning>
       <refsect3>
         <title>Operating sparse matrices</title>
             made using the same syntax as for full matrices.
         </para>
         <para>
-            Elementary functions are also available (<literal>abs,maxi,sum,diag,...</literal>)
+            Elementary functions are also available (<literal>abs, min, max, sum, diag,...</literal>)
             for sparse matrices.
         </para>
         <para>
             Mixed operations (full-sparse) are allowed. Results are full or sparse
             depending on the operations.
         </para>
-        <para>
-            Note : Any operation involving dense matrices of the same size, either as argument (e.g. <literal>sp=sparse(d)</literal>)
-            or as result (e.g.  <literal>d= sp + 1.</literal>) is provided for convenience purposes but should of course be avoided.
-            Furthermore, random access to elements (<literal>sp(r,c)</literal>), especially for insertions, is not efficient, so
-            any performance-constrained access should be done in batches with <link linkend="spget">spget</link> for read access
-            and the three arguments constructor <literal>sp=sparse(ij, v, mn)</literal> for write access.
-        </para>
+        <note>
+          <para>
+              Any operation involving dense matrices of the same size, either as argument
+              (e.g. <literal>sp=sparse(d)</literal>) or as result (e.g.
+              <literal>d= sp + 1.</literal>) is provided for convenience purposes but should
+              of course be avoided.
+          </para>
+          <para>
+              Furthermore, random access to elements (<literal>sp(r,c)</literal>), especially
+              for insertions, is not efficient. So, any performance-constrained access should be
+              done in batches with <link linkend="spget">spget</link> for read access, and with any
+              <literal>sp=sparse(ij, v, mn)</literal> call for write access.
+          </para>
+        </note>
       </refsect3>
     </refsection>
     <refsection>
@@ -161,4 +177,15 @@ sp = sparse(dense)
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0.2</revnumber>
+                <revdescription>
+                    sparse([],[]) now yields the "(0,0) zero sparse matrix" instead of [].
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index e66351f..c9ea86b 100644 (file)
             <literal>ij(:,1)</literal> および <literal>ij(:,2)</literal>の
             最大値となります.
         </para>
-        <warning>For the building syntaxes, if several values are given for a same
-            <varname>ij</varname> position, the sum of theses values is assigned.
+        <warning>
+            <itemizedlist>
+              <listitem>
+                  For the building syntaxes, if several values are given for a same
+                  <varname>ij</varname> position, the sum of theses values is assigned.
+              </listitem>
+              <listitem>
+                <literal>sparse([],[])</literal> yields the <literal>(0, 0) zero sparse matrix</literal>,
+                with <literal>sparse([],[]) ~= []</literal>.
+              </listitem>
+            </itemizedlist>
         </warning>
       <refsect3>
         <title>Operating sparse matrices</title>
             行ないます.
         </para>
         <para>
-            基本的な関数(<literal>abs,maxi,sum,diag,...</literal>)は疎行列でも
+            基本的な関数(<literal>abs, min, max, sum, diag,...</literal>)は疎行列でも
             利用可能です.
         </para>
         <para>
             (通常の行列と疎行列の)混用も可能です.
             結果は処理に応じて通常または疎行列となります.
         </para>
-        <para>
-            注意 :
-            同じ大きさの通常の行列を含む任意の演算は,
-            引数(例: <literal>sp=sparse(d)</literal>),
-            または,結果(例  <literal>d= sp + 1.</literal>) のどちら
-            についても利便性のために提供されていますが,当然避けるべきです.
-            更に,要素(<literal>sp(r,c)</literal>)へのランダムアクセス,
-            特に挿入,は効率的ではありません.
-            このため,性能面の制約があるアクセスでは,
-            読込みアクセスは<link linkend="spget">spget</link>,
-            書込みアクセスは<literal>sp=sparse(ij, v, mn)</literal>による
-            バッチ処理により行う必要があります.
-        </para>
+        <note>
+          <para>
+              同じ大きさの通常の行列を含む任意の演算は,
+              引数(例: <literal>sp=sparse(d)</literal>),
+              または,結果(例  <literal>d= sp + 1.</literal>) のどちら
+              についても利便性のために提供されていますが,当然避けるべきです.
+          </para>
+          <para>
+              更に,要素(<literal>sp(r,c)</literal>)へのランダムアクセス,
+              特に挿入,は効率的ではありません.
+              このため,性能面の制約があるアクセスでは,
+              読込みアクセスは<link linkend="spget">spget</link>,
+              書込みアクセスは<literal>sp=sparse(ij, v, mn)</literal>による
+              バッチ処理により行う必要があります.
+          </para>
+        </note>
       </refsect3>
     </refsection>
     <refsection>
@@ -172,4 +184,15 @@ sp=sparse(dense)
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>履歴</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0.2</revnumber>
+                <revdescription>
+                    sparse([],[]) now yields the "(0,0) zero sparse matrix" instead of [].
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
\ No newline at end of file
index eb5b7e3..b580f1e 100644 (file)
             <literal>sp</literal> são os valores máximos de <literal>ij(:,1)</literal>
             e <literal>ij(:,2)</literal> respectivamente.
         </para>
-        <warning>For the building syntaxes, if several values are given for a same
-            <varname>ij</varname> position, the sum of theses values is assigned.
+        <warning>
+            <itemizedlist>
+              <listitem>
+                  For the building syntaxes, if several values are given for a same
+                  <varname>ij</varname> position, the sum of theses values is assigned.
+              </listitem>
+              <listitem>
+                <literal>sparse([],[])</literal> yields the <literal>(0, 0) zero sparse matrix</literal>,
+                with <literal>sparse([],[]) ~= []</literal>.
+              </listitem>
+            </itemizedlist>
         </warning>
       <refsect3>
         <title>Operating sparse matrices</title>
             feitas usando a mesma sintaxe para matrizes completas.
         </para>
         <para>Funções elementares também estão disponíveis
-            (<literal>abs,maxi,sum,diag,...</literal>) para matrizes esparsas.
+            (<literal>abs, min, max, sum, diag,...</literal>) para matrizes esparsas.
         </para>
         <para>Operações mistas (completas-esparsas) são permitidas. Os resultados
             são completos ou esparsos dependendo das operações.
@@ -157,4 +166,15 @@ sp = sparse(dense)
             </member>
         </simplelist>
     </refsection>
+    <refsection role="history">
+        <title>Histórico</title>
+        <revhistory>
+            <revision>
+                <revnumber>6.0.2</revnumber>
+                <revdescription>
+                    sparse([],[]) now yields the "(0,0) zero sparse matrix" instead of [].
+                </revdescription>
+            </revision>
+        </revhistory>
+    </refsection>
 </refentry>
index 4841815..1b275a0 100644 (file)
@@ -72,7 +72,8 @@
             </mediaobject>
         </informalequation>
 
-        Where y0 is an initial condition and t0 is its corresponding time.
+      where y<subscript>0</subscript> is an initial condition and t<subscript>0</subscript> is
+      its corresponding time.
     </refsection>
     <refsection id="Dialogbox_INTEGRAL_m">
         <title>Parameters</title>
                 </para>
             </listitem>
         </itemizedlist>
-        <para/>
     </refsection>
 
     <refsection id="Interfacingfunction_INTEGRAL_m">
     </refsection>
     <refsection id="Examples_INTEGRAL_m">
         <title>Examples</title>
-        <refsect2 id="Example_INTEGRAL_m_1">
+        <refsect3 id="Example_INTEGRAL_m_1">
             <title>Example 1</title>
             <para>This sample model demonstrates how to use the integrator's state
                 port.
@@ -280,8 +280,8 @@ xcos_simulate(scs_m, 4);
 ]]></scilab:image>
             </para>
 
-        </refsect2>
-        <refsect2 id="Example_INTEGRAL_m_2">
+        </refsect3>
+        <refsect3 id="Example_INTEGRAL_m_2">
             <title>Example 2</title>
             <para>
                 <link type="scilab" linkend="scilab.xcos/xcos/examples/continuous_pal/INTEGRAL_m_2_Example.zcos">
@@ -296,6 +296,6 @@ importXcosDiagram(SCI + "/modules/xcos/examples/continuous_pal/INTEGRAL_m_2_Exam
 xcos_simulate(scs_m, 4);
 ]]></scilab:image>
             </para>
-        </refsect2>
+        </refsect3>
     </refsection>
 </refentry>
index e2d7fb1..2579584 100644 (file)
     </refsection>
     <refsection id="Examples_PID">
         <title>Examples</title>
-        <refsect2 id="Example_1_PID">
+        <refsect3 id="Example_1_PID">
             <title>Example 1</title>
             <para>This example illustrates the usage of PID regulator. It enables you
                 to fit the output signal <emphasis>U<subscript>pr</subscript>(t)</emphasis>
                         </imageobject>
                     </inlinemediaobject>
                 </link>
+            </para>
+            <para>
                 <scilab:image><![CDATA[
 importXcosDiagram(SCI + "/modules/xcos/examples/continuous_pal/PID_1_Example.zcos");
 xcos_simulate(scs_m, 4);
 ]]></scilab:image>
             </para>
-        </refsect2>
-        <refsect2 id="Example_2_PID">
+        </refsect3>
+        <refsect3 id="Example_2_PID">
             <title>Example 2</title>
             <para>
                 <link type="scilab" linkend="scilab.xcos/xcos/examples/continuous_pal/PID_2_Example.zcos">
@@ -296,13 +298,15 @@ xcos_simulate(scs_m, 4);
                         </imageobject>
                     </inlinemediaobject>
                 </link>
+            </para>
+            <para>
                 <scilab:image><![CDATA[
 importXcosDiagram(SCI + "/modules/xcos/examples/continuous_pal/PID_2_Example.zcos");
 xcos_simulate(scs_m, 4);
 ]]></scilab:image>
             </para>
-        </refsect2>
-        <refsect2 id="Example_3_PID">
+        </refsect3>
+        <refsect3 id="Example_3_PID">
             <title>Example 3</title>
             <para>
                 <link type="scilab" linkend="scilab.xcos/xcos/examples/continuous_pal/PID_3_Example.zcos">
@@ -312,11 +316,13 @@ xcos_simulate(scs_m, 4);
                         </imageobject>
                     </inlinemediaobject>
                 </link>
+            </para>
+            <para>
                 <scilab:image><![CDATA[
 importXcosDiagram(SCI + "/modules/xcos/examples/continuous_pal/PID_3_Example.zcos");
 xcos_simulate(scs_m, 4);
 ]]></scilab:image>
             </para>
-        </refsect2>
+        </refsect3>
     </refsection>
 </refentry>
index 8fd20d9..3de5a04 100644 (file)
                     <listitem>
                         <para>
                             The first <literal>N</literal> elements of the
-                            <literal>Input_i</literal> are the continuous-time dynamics.
+                            <literal>Input<subscript>i</subscript></literal> are the continuous-time dynamics.
                             The dynamics of the system in the control mode <literal>i</literal> is
                             described by a smooth index-1 DAE <latex>$0 = F_i(\dot{x}, x, u, t)$</latex>.
                         </para>
                     </listitem>
                     <listitem>
                         <para>
-                            The next <literal>N</literal> elements of <literal>Input_i</literal>
+                            The next <literal>N</literal> elements of
+                            <literal>Input<subscript>i</subscript></literal>
                             are the values used to reset the continuous-time state when a
                             transition to control mode <literal>i</literal> is activated.
                         </para>
                     </listitem>
                     <listitem>
                         <para>
-                            The next <literal>Z_i</literal> elements of <literal>Input_i</literal>
+                            The next <literal>Z<subscript>i</subscript></literal> elements of
+                            <literal>Input<subscript>i</subscript></literal>
                             are the jump or zero-crossing functions. If the <literal>j</literal>-th
                             zero-crossing function of mode <literal>i</literal> crosses zero with
                             negative to positive direction, a transition to <literal>j</literal>-th
index 19de493..404e8ea 100644 (file)
                     </imageobject>
                 </inlinemediaobject>
             </link>
+        </para>
+        <para>
             <scilab:image><![CDATA[
 importXcosDiagram(SCI + "/modules/xcos/examples/discrete_pal/en_US/DELAY_f_2_en_US.zcos");
 xcos_simulate(scs_m, 4);
index 831591e..4d4af84 100644 (file)
         </itemizedlist>
         <para/>
     </refsection>
+    <refsection id="Example_REGISTER">
+        <title>Example</title>
+        <para>
+            <link type="scilab" linkend="scilab.xcos/xcos/examples/discrete_pal/en_US/DELAY_f_2_en_US.zcos">
+                <inlinemediaobject>
+                    <imageobject>
+                        <imagedata fileref="../../../../examples/discrete_pal/en_US/DELAY_f_2_en_US.zcos" align="center" valign="middle"/>
+                    </imageobject>
+                </inlinemediaobject>
+            </link>
+        </para>
+        <para>
+            <scilab:image><![CDATA[
+importXcosDiagram(SCI + "/modules/xcos/examples/discrete_pal/en_US/DELAY_f_2_en_US.zcos");
+xcos_simulate(scs_m, 4);
+]]></scilab:image>
+        </para>
+    </refsection>
     <refsection id="Interfacingfunction_REGISTER">
         <title>Interfacing function</title>
         <itemizedlist>
             </listitem>
         </itemizedlist>
     </refsection>
-    <refsection id="Example_REGISTER">
-        <title>Example</title>
-        <para>
-            <link type="scilab" linkend="scilab.xcos/xcos/examples/discrete_pal/en_US/DELAY_f_2_en_US.zcos">
-                <inlinemediaobject>
-                    <imageobject>
-                        <imagedata fileref="../../../../examples/discrete_pal/en_US/DELAY_f_2_en_US.zcos" align="center" valign="middle"/>
-                    </imageobject>
-                </inlinemediaobject>
-            </link>
-            <scilab:image><![CDATA[
-importXcosDiagram(SCI + "/modules/xcos/examples/discrete_pal/en_US/DELAY_f_2_en_US.zcos");
-xcos_simulate(scs_m, 4);
-]]></scilab:image>
-        </para>
-    </refsection>
 </refentry>
index 581f595..f09b8eb 100644 (file)
@@ -65,7 +65,6 @@
             Xcos blocks). The voltage across the block is independent of the current
             value.
         </para>
-        <para/>
     </refsection>
     <refsection id="Defaultproperties_CCS">
         <title>Default properties</title>
                 </para>
             </listitem>
         </itemizedlist>
-        <para/>
     </refsection>
     <refsection id="Interfacingfunction_CCS">
         <title>Interfacing function</title>
index c4b4353..ba48b6a 100644 (file)
             A capacitor is an electrical component that can store energy in
             electrical circuits. The relationship between the voltage  across a
             capacitor with capacitance  and the current  passing through it
-            is given by the equation:
+            is given by the equation: <emphasis>I = C.dV / dt</emphasis>
         </para>
-               <para>
-                       <emphasis>I = C.dV / dt</emphasis>
-               </para>
         <para>
             Capacitors can also be used to differentiate between high-frequency
             and low-frequency signals and this makes them useful in electronic
index 24d611a..1ca56f7 100644 (file)
@@ -76,8 +76,7 @@
                 </imageobject>
             </inlinemediaobject>
         </para>
-        <para>
-        </para>
+        <para/>
         <informaltable border="1" cellpadding="3">
             <tr>
                 <td align="left">Parameter</td>
index f08695f..d815307 100644 (file)
@@ -69,7 +69,7 @@
         <title>Description</title>
         <para>
             This blocks generates events at specific sample time of the simulation time. The sample time is given in the "Sample Time" field and the offset is given in the "Offset" field. This block has one event input, the number of event outputs depends on the number of different sample time. For example if the vector of sample time is [1 1 2] and the vector of offset is [0 .5 0] then the block has 7 outputs.
-            <itemizedlist>
+            <orderedlist>
                 <listitem>
                     <para>
                         The first output is activated when the simulation time is equal to a
@@ -96,7 +96,7 @@
                 </listitem>
                 <listitem>
                     <para>
-                        The fifth output is activated when we have both cases, first case and 
+                        The fifth output is activated when we have both cases, first case and
                         forth case.
                     </para>
                 </listitem>
                 <listitem>
                     <para>etc...</para>
                 </listitem>
-            </itemizedlist>
+            </orderedlist>
         </para>
         <para>
             So the number of outputs is equal to 2**number of different time values. Each of these
index c0381a8..e0ab1f3 100644 (file)
                     </imageobject>
                 </inlinemediaobject>
             </link>
-        </para>
-        <scilab:image><![CDATA[
-importXcosDiagram(SCI + "/modules/xcos/examples/events_pal/en_US/freq_div_en_US.zcos");
-xcos_simulate(scs_m, 4);
+          <scilab:image><![CDATA[
+  importXcosDiagram(SCI + "/modules/xcos/examples/events_pal/en_US/freq_div_en_US.zcos");
+  xcos_simulate(scs_m, 4);
 ]]></scilab:image>
+        </para>
     </refsection>
 </refentry>
index 6fda6c6..c5b3688 100644 (file)
@@ -27,7 +27,7 @@
         xml:id="INTRPLBLK_f" xml:lang="en_US">
     <refnamediv>
         <refname>INTRPLBLK_f</refname>
-        <refpurpose>Interpolation</refpurpose>
+        <refpurpose>Linear interpolation</refpurpose>
     </refnamediv>
     <refsection>
         <title>Block Screenshot</title>
index c0d2228..8af8f25 100644 (file)
  *
  -->
 <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="INTEGRAL_f" xml:lang="fr">
+          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="INTEGRAL_f" xml:lang="fr">
     <refnamediv>
         <refname>INTEGRAL_f</refname>
         <refpurpose>Intégration</refpurpose>
     </refnamediv>
     <refsection>
         <title>Aperçu</title>
-               <inlinemediaobject>
-                       <imageobject>
-                               <imagedata align="center" fileref="../../../../images/palettes/INTEGRAL_f.png"/>
-                       </imageobject>
-               </inlinemediaobject>
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata align="center" fileref="../../../../images/palettes/INTEGRAL_f.png"/>
+            </imageobject>
+        </inlinemediaobject>
     </refsection>
     <refsection id="Contents_INTEGRAL_f">
         <title>Contenu</title>
-               <itemizedlist>
-                       <listitem>
-                               <xref linkend="Description_INTEGRAL_f">Description</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Dialogbox_INTEGRAL_f">Paramètres</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Defaultproperties_INTEGRAL_f">Propriétés par défaut</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Interfacingfunction_INTEGRAL_f">Fonction d'interfaçage</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Computationalfunction_INTEGRAL_f">Fonction de calcul</xref>
-                       </listitem>
-               </itemizedlist>
+        <itemizedlist>
+            <listitem>
+                <xref linkend="Description_INTEGRAL_f">Description</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Dialogbox_INTEGRAL_f">Paramètres</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Defaultproperties_INTEGRAL_f">Propriétés par défaut</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Interfacingfunction_INTEGRAL_f">Fonction d'interfaçage</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Computationalfunction_INTEGRAL_f">Fonction de calcul</xref>
+            </listitem>
+        </itemizedlist>
     </refsection>
     <refsection id="Description_INTEGRAL_f">
         <title>Description</title>
     </refsection>
     <refsection id="Dialogbox_INTEGRAL_f">
         <title>Paramètres</title>
-               <inlinemediaobject>
-                       <imageobject>
-                               <imagedata fileref="../../../../images/gui/INTEGRAL_f_gui.gif"
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="../../../../images/gui/INTEGRAL_f_gui.gif"
                             align="center" style="float:right"/>
                 <!-- align => Javahelp, style => Online -->
-                       </imageobject>
-               </inlinemediaobject>
+            </imageobject>
+        </inlinemediaobject>
         <itemizedlist>
             <listitem>
                 <para>
                 </para>
             </listitem>
         </itemizedlist>
-               <para/>
+        <para/>
     </refsection>
     <refsection id="Interfacingfunction_INTEGRAL_f">
         <title>Fonction d'interfaçage</title>
index 232ab99..a70af7a 100644 (file)
  *
  -->
 <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="INTEGRAL_m" xml:lang="fr">
+          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="INTEGRAL_m" xml:lang="fr">
     <refnamediv>
         <refname>INTEGRAL_m</refname>
         <refpurpose>Intégration</refpurpose>
     </refnamediv>
     <refsection>
         <title>Aperçu</title>
-               <inlinemediaobject>
-                       <imageobject>
-                               <imagedata align="center" fileref="../../../../images/palettes/INTEGRAL_m.png"/>
-                       </imageobject>
-               </inlinemediaobject>
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata align="center" fileref="../../../../images/palettes/INTEGRAL_m.png"/>
+            </imageobject>
+        </inlinemediaobject>
     </refsection>
     <refsection id="Contents_INTEGRAL_m">
         <title>Contenu</title>
-               <itemizedlist>
-                       <listitem>
-                               <xref linkend="Description_INTEGRAL_m">Description</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Dialogbox_INTEGRAL_m">Paramètres</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Defaultproperties_INTEGRAL_m">Propriétés par défaut</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Interfacingfunction_INTEGRAL_m">Fonction d'interfaçage</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Computationalfunction_INTEGRAL_m">Fonction de calcul</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Examples_INTEGRAL_m">Exemple</xref>
-                       </listitem>
-               </itemizedlist>
+        <itemizedlist>
+            <listitem>
+                <xref linkend="Description_INTEGRAL_m">Description</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Dialogbox_INTEGRAL_m">Paramètres</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Defaultproperties_INTEGRAL_m">Propriétés par défaut</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Interfacingfunction_INTEGRAL_m">Fonction d'interfaçage</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Computationalfunction_INTEGRAL_m">Fonction de calcul</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Examples_INTEGRAL_m">Exemples</xref>
+            </listitem>
+        </itemizedlist>
     </refsection>
     <refsection id="Description_INTEGRAL_m">
         <title>Description</title>
-               <para>
-                       Ce bloc est un intégrateur. La sortie y est l'intégrale de l'entrée u à l'instant courant t.
-               </para>
+        <para>
+            Ce bloc est un intégrateur. La sortie y est l'intégrale de l'entrée u à l'instant courant t.
+        </para>
         <informalequation>
             <mediaobject>
                 <imageobject>
@@ -64,7 +64,8 @@
                 </imageobject>
             </mediaobject>
         </informalequation>
-        où y0 est une condition initiale et t0 est le temps correspondant à cette condition.
+        où y<subscript>0</subscript> est une condition initiale et t<subscript>0</subscript> est
+        le temps correspondant à cette condition.
     </refsection>
     <refsection id="Dialogbox_INTEGRAL_m">
         <title>Paramètres</title>
         </para>
         <para>Dans ce cas, la valeur du signal de réinitialisation dépend d'un signal extèrieur.</para>
         <para/>
-               <inlinemediaobject>
-                       <imageobject>
-                               <imagedata fileref="../../../../images/gui/INTEGRAL_m_gui.gif"
-                                                  align="center" style="float:right"/>
-                               <!-- align => Javahelp, style => Online -->
-                       </imageobject>
-               </inlinemediaobject>
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="../../../../images/gui/INTEGRAL_m_gui.gif"
+                           align="center" style="float:right"/>
+                <!-- align => Javahelp, style => Online -->
+            </imageobject>
+        </inlinemediaobject>
         <itemizedlist>
             <listitem>
                 <para>
                 </para>
             </listitem>
         </itemizedlist>
-               <para/>
     </refsection>
     <refsection id="Interfacingfunction_INTEGRAL_m">
         <title>Fonction d'interfaçage</title>
         </itemizedlist>
     </refsection>
     <refsection id="Examples_INTEGRAL_m">
-        <title>Examples</title>
-        <refsection id="Example_INTEGRAL_m_1">
+        <title>Exemples</title>
+        <refsect3 id="Example_INTEGRAL_m_1">
             <title>Exemple 1</title>
             <para>Cet exemple de modèle montre comment utiliser le port d'état de l'intégrateur.</para>
             <para>Le paramètre de ré-initialisation est mis à 1, La limite haute à 1 et la limite basse à -1.</para>
@@ -248,8 +248,8 @@ importXcosDiagram(SCI + "/modules/xcos/examples/continuous_pal/INTEGRAL_m_1_Exam
 xcos_simulate(scs_m, 4);
 ]]></scilab:image>
             </para>
-        </refsection>
-        <refsection id="Example_INTEGRAL_m_2">
+        </refsect3>
+        <refsect3 id="Example_INTEGRAL_m_2">
             <title>Exemple 2</title>
             <para>
                 <link type="scilab" linkend="scilab.xcos/xcos/examples/continuous_pal/INTEGRAL_m_2_Example.zcos">
@@ -264,6 +264,6 @@ importXcosDiagram(SCI + "/modules/xcos/examples/continuous_pal/INTEGRAL_m_2_Exam
 xcos_simulate(scs_m, 4);
 ]]></scilab:image>
             </para>
-        </refsection>
+        </refsect3>
     </refsection>
 </refentry>
index 91d312a..b13eb92 100644 (file)
     </refsection>
     <refsection id="Examples_PID">
         <title>Exemples</title>
-        <refsection id="Example_1_PID">
+        <refsect3 id="Example_1_PID">
             <title>Exemple 1</title>
-            <para>This example illustrates the usage of PID regulator. It enables you
-                to fit the output signal <emphasis>U<subscript>pr</subscript>(t)</emphasis>
-                to the required signal <emphasis>U<subscript>r</subscript>(t)</emphasis> easily.
+            <para>Cet exemple illustre l'utilisation d'une régulation PID. Il permet
+                de faire converger aisément le signal de sortie
+                <emphasis>U<subscript>pr</subscript>(t)</emphasis>
+                vers le signal requis <emphasis>U<subscript>r</subscript>(t)</emphasis>.
             </para>
-            <para>In this example the control system is a second-order unity-gain
-                low-pass filter with damping ratio ξ=0.5 and cutoff frequency fc= 100 Hz.
-                Its transfer function H(s) is:
+            <para>Dans cet exemple, le régulateur est un filtre passe-bas d'ordre 2 et de gain
+                unité, avec un taux d'amortissement ξ=0.5 et une fréquence de coupure fc= 100 Hz.
+                Sa fonction de transfert H(s) est :
             </para>
             <para>
                 <inlinemediaobject>
                     </imageobject>
                 </inlinemediaobject>
             </para>
-            <para>To model this filter we use Continuous transfer function block (CLR)
-                from Continuous time systems Palette.
+            <para>Pour modéliser ce filtre, nous utilisons le bloc de Fonction de transfert continue
+              (CLR) proposé dans la palette <emphasis>Systèmes à temps continu</emphasis>.
             </para>
-            <para>The PID parameters Kp, Ki and Kd are set to 100, 0.1 and 0.</para>
+            <para>Les paramètres PID  Kp, Ki et Kd sont respectivement établis à 100, 0.1 et 0.</para>
             <para>
                 <inlinemediaobject>
                     <imageobject>
                     </imageobject>
                 </inlinemediaobject>
             </para>
-            <para>The scope displays the waveforms of system error
-                <emphasis>U<subscript>e</subscript></emphasis> (black),
-                reference signal <emphasis>U<subscript>r</subscript></emphasis> (blue) and process
-                signal <emphasis>U<subscript>pr</subscript></emphasis> (red). It shows how
-                initially the process signal <emphasis>U<subscript>pr</subscript>(t)</emphasis>
-                does not follow the reference signal <emphasis>U<subscript>r</subscript>(t)</emphasis>.
+            <para>L'oscilloscope affiche la courbe d'erreur (écart à la consigne),
+                <emphasis>U<subscript>e</subscript></emphasis> (black), le signal de consigne
+                (référence) <emphasis>U<subscript>r</subscript></emphasis> (bleu), et le signal
+                effectif <emphasis>U<subscript>pr</subscript></emphasis> (rouge). Il montre
+                l'écart initial entre le signal effectif <emphasis>U<subscript>pr</subscript>(t)</emphasis>
+                et le signal de consigne <emphasis>U<subscript>r</subscript>(t)</emphasis>.
             </para>
             <para>
                 <link type="scilab" linkend="scilab.xcos/xcos/examples/continuous_pal/PID_1_Example.zcos">
                         </imageobject>
                     </inlinemediaobject>
                 </link>
+            </para>
+            <para>
                 <scilab:image><![CDATA[
 importXcosDiagram(SCI + "/modules/xcos/examples/continuous_pal/PID_1_Example.zcos");
 xcos_simulate(scs_m, 4);
 ]]></scilab:image>
             </para>
-        </refsection>
-        <refsection id="Example_2_PID">
+        </refsect3>
+        <refsect3 id="Example_2_PID">
             <title>Exemple 2</title>
             <para>
                 <link type="scilab" linkend="scilab.xcos/xcos/examples/continuous_pal/PID_2_Example.zcos">
@@ -252,13 +255,15 @@ xcos_simulate(scs_m, 4);
                         </imageobject>
                     </inlinemediaobject>
                 </link>
+            </para>
+            <para>
                 <scilab:image><![CDATA[
 importXcosDiagram(SCI + "/modules/xcos/examples/continuous_pal/PID_2_Example.zcos");
 xcos_simulate(scs_m, 4);
 ]]></scilab:image>
             </para>
-        </refsection>
-        <refsection id="Example_3_PID">
+        </refsect3>
+        <refsect3 id="Example_3_PID">
             <title>Exemple 3</title>
             <para>
                 <link type="scilab" linkend="scilab.xcos/xcos/examples/continuous_pal/PID_3_Example.zcos">
@@ -268,11 +273,13 @@ xcos_simulate(scs_m, 4);
                         </imageobject>
                     </inlinemediaobject>
                 </link>
+            </para>
+            <para>
                 <scilab:image><![CDATA[
 importXcosDiagram(SCI + "/modules/xcos/examples/continuous_pal/PID_3_Example.zcos");
 xcos_simulate(scs_m, 4);
 ]]></scilab:image>
             </para>
-        </refsection>
+        </refsect3>
     </refsection>
 </refentry>
index ded485e..1400852 100644 (file)
         <para>La palette Systèmes à temps discret contient les blocs de modélisation en temps discret.</para>
     </refsection>
     <refsection id="Blocks_Discrete_pal" role="see also">
-        <title>Blocks</title>
+        <title>Blocs</title>
         <simplelist>
             <member>
                 <link linkend="DELAY_f">DELAY_f</link>
index 2132049..52b5416 100644 (file)
@@ -19,7 +19,7 @@
           xmlns:scilab="http://www.scilab.org" xml:id="DELAYV_f" xml:lang="fr">
     <refnamediv>
         <refname>DELAYV_f</refname>
-        <refpurpose>Délai variable</refpurpose>
+        <refpurpose>Retard variable</refpurpose>
     </refnamediv>
     <refsection>
         <title>Aperçu</title>
         </itemizedlist>
     </refsection>
     <refsection id="Example_DELAYV_f">
-        <title>Exemple de délai variable</title>
+        <title>Exemple de retard variable</title>
         <para>
             Dans cet exemple, la fonction sinus (en noir) est retardée alternativement de 0 et 1 seconde.
             L'amplitude du bloc GENSQR_f est fixée à 2, mais le paramètre "Max delay" du bloc DELAVV_f
index 7007ddc..4ea795a 100644 (file)
@@ -30,7 +30,7 @@
         <refpurpose>Retard en temps discret</refpurpose>
     </refnamediv>
     <refsection>
-        <title>Block Screenshot</title>
+        <title>Aperçu</title>
         <inlinemediaobject>
             <imageobject>
                 <imagedata fileref="../../../../images/palettes/DELAY_f.png" align="center"/>
@@ -38,7 +38,7 @@
         </inlinemediaobject>
     </refsection>
     <refsection id="Contents_DELAY_f">
-        <title>Contents</title>
+        <title>Contenu</title>
         <itemizedlist>
             <listitem>
                 <xref linkend="Description_DELAY_f">Description</xref>
index 5f02177..27b4677 100644 (file)
  *
  -->
 <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="DOLLAR_f" xml:lang="fr">
+          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="DOLLAR_f" xml:lang="fr">
     <refnamediv>
         <refname>DOLLAR_f</refname>
         <refpurpose>Opérateur Retard</refpurpose>
     </refnamediv>
     <refsection>
         <title>Aperçu</title>
-               <inlinemediaobject>
-                       <imageobject>
-                               <imagedata align="center" fileref="../../../../images/palettes/DOLLAR_f.png"/>
-                       </imageobject>
-               </inlinemediaobject>
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata align="center" fileref="../../../../images/palettes/DOLLAR_f.png"/>
+            </imageobject>
+        </inlinemediaobject>
     </refsection>
     <refsection id="Contents_DOLLAR_f">
         <title>Contenu</title>
-               <itemizedlist>
-                       <listitem>
-                               <xref linkend="Description_DOLLAR_f">Description</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Dialogbox_DOLLAR_f">Paramètres</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Defaultproperties_DOLLAR_f">Propriétés par défaut</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Example_DOLLAR_f">Exemple</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Interfacingfunction_DOLLAR_f">Fonction d'interfaçage</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Computationalfunction_DOLLAR_f">Fonction de calcul</xref>
-                       </listitem>
-               </itemizedlist>
+        <itemizedlist>
+            <listitem>
+                <xref linkend="Description_DOLLAR_f">Description</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Dialogbox_DOLLAR_f">Paramètres</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Defaultproperties_DOLLAR_f">Propriétés par défaut</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Example_DOLLAR_f">Exemple</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Interfacingfunction_DOLLAR_f">Fonction d'interfaçage</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Computationalfunction_DOLLAR_f">Fonction de calcul</xref>
+            </listitem>
+        </itemizedlist>
     </refsection>
     <refsection id="Description_DOLLAR_f">
         <title>Description</title>
     </refsection>
     <refsection id="Dialogbox_DOLLAR_f">
         <title>Paramètres</title>
-               <inlinemediaobject>
-                       <imageobject>
-                               <imagedata fileref="../../../../images/gui/DOLLAR_f_gui.gif"
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="../../../../images/gui/DOLLAR_f_gui.gif"
                             align="center" style="float:right"/>
                 <!-- align => Javahelp, style => Online -->
-                       </imageobject>
-               </inlinemediaobject>
+            </imageobject>
+        </inlinemediaobject>
         <itemizedlist>
             <listitem>
                 <para>
                 </para>
             </listitem>
         </itemizedlist>
-               <para/>
+        <para/>
     </refsection>
     <refsection id="Example_DOLLAR_f">
         <title>Exemple</title>
                     </imageobject>
                 </inlinemediaobject>
             </link>
+        </para>
+        <para>
             <scilab:image><![CDATA[
 importXcosDiagram(SCI + "/modules/xcos/examples/discrete_pal/en_US/DELAY_f_2_en_US.zcos");
 xcos_simulate(scs_m, 4);
index 963badb..e0706f9 100644 (file)
                     </imageobject>
                 </inlinemediaobject>
             </link>
+        </para>
+        <para>
             <scilab:image><![CDATA[
 importXcosDiagram(SCI + "/modules/xcos/examples/discrete_pal/en_US/DELAY_f_2_en_US.zcos");
 xcos_simulate(scs_m, 4);
index 4532ceb..54cf844 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: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="Capacitor" xml:lang="fr">
+<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="Capacitor" xml:lang="fr">
     <refnamediv>
         <refname>Capacitor</refname>
         <refpurpose>Capacité électrique</refpurpose>
     </refnamediv>
     <refsection>
         <title>Aperçu</title>
-               <inlinemediaobject>
-                       <imageobject>
-                               <imagedata fileref="../../../../images/palettes/Capacitor.png" align="center"/>
-                       </imageobject>
-               </inlinemediaobject>
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="../../../../images/palettes/Capacitor.png" align="center"/>
+            </imageobject>
+        </inlinemediaobject>
     </refsection>
     <refsection id="Contents_Capacitor">
         <title>Contenu</title>
-               <itemizedlist>
-                       <listitem>
-                               <xref linkend="Description_Capacitor">Description</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Dialogbox_Capacitor">Paramètres</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Defaultproperties_Capacitor">Propriétés par défaut</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Interfacingfunction_Capacitor">Fonction d'interfaçage</xref>
-                       </listitem>
-                       <listitem>
-                               <link linkend="Capacitor">Modèle Modelica</link>
-                       </listitem>
-               </itemizedlist>
+        <itemizedlist>
+            <listitem>
+                <xref linkend="Description_Capacitor">Description</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Dialogbox_Capacitor">Paramètres</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Defaultproperties_Capacitor">Propriétés par défaut</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Interfacingfunction_Capacitor">Fonction d'interfaçage</xref>
+            </listitem>
+            <listitem>
+                <link linkend="Capacitor">Modèle Modelica</link>
+            </listitem>
+        </itemizedlist>
     </refsection>
     <refsection id="Description_Capacitor">
         <title>Description</title>
         <para>
             Une capacité est un composant qui dans un circuit électrique peut stocker de l'énergie.
             La relation entre la tension aux bornes de la capacité et le courant la traversant est donnée par :
+            <emphasis>I = C.dV / dt</emphasis>
         </para>
-                       <emphasis>I = C.dV / dt</emphasis>
         <para>
             Les capacités peuvent aussi être utilisées pour discriminer les signaux de haute et basse fréquences,
             ce qui les rend utiles dans les filtres électroniques. Une capacité a une grande impédance pour les signaux de
     </refsection>
     <refsection id="Dialogbox_Capacitor">
         <title>Paramètres</title>
-               <inlinemediaobject>
-                       <imageobject>
-                               <imagedata fileref="../../../../images/gui/Capacitor_gui.gif"
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="../../../../images/gui/Capacitor_gui.gif"
                             align="center" style="float:right"/>
                 <!-- align => Javahelp, style => Online -->
-                       </imageobject>
-               </inlinemediaobject>
+            </imageobject>
+        </inlinemediaobject>
         <itemizedlist>
             <listitem>
                 <para>
                 </para>
             </listitem>
         </itemizedlist>
-               <para/>
+        <para/>
     </refsection>
     <refsection id="Interfacingfunction_Capacitor">
         <title>Fonction d'interfaçage</title>
index a0042f5..2592cf4 100644 (file)
@@ -18,8 +18,8 @@
           xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
           xmlns:scilab="http://www.scilab.org" xml:id="CurrentSensor" xml:lang="fr">
     <refnamediv>
-        <refname>Ampèremètre</refname>
-        <refpurpose>Mesure d'intensité de courant électrique</refpurpose>
+        <refname>CurrentSensor</refname>
+        <refpurpose>Ampèremètre idéal</refpurpose>
     </refnamediv>
     <refsection>
         <title>Aperçu</title>
index bceeba3..0f1ff37 100644 (file)
@@ -69,6 +69,7 @@
                 <!-- align => Javahelp, style => Online -->
             </imageobject>
         </inlinemediaobject>
+        <para/>
         <informaltable border="1" cellpadding="3">
             <tr>
                 <td align="left">Parameter</td>
index 6ffa3a4..be7510d 100644 (file)
@@ -18,8 +18,8 @@
           xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
           xmlns:scilab="http://www.scilab.org" xml:id="PotentialSensor" xml:lang="fr">
     <refnamediv>
-        <refname>Voltmètre</refname>
-        <refpurpose>Mesure de tension électrique</refpurpose>
+        <refname>PotentialSensor</refname>
+        <refpurpose>Mesure de potentiel électrique</refpurpose>
     </refnamediv>
     <refsection>
         <title>Aperçu</title>
index e854508..52917e8 100644 (file)
@@ -18,8 +18,8 @@
           xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
           xmlns:scilab="http://www.scilab.org" xml:id="VoltageSensor" xml:lang="fr">
     <refnamediv>
-        <refname>Voltmètre idéal</refname>
-        <refpurpose>Mesure de tension électrique</refpurpose>
+        <refname>VoltageSensor</refname>
+        <refpurpose>Voltmètre idéal</refpurpose>
     </refnamediv>
     <refsection>
         <title>Aperçu</title>
index e6e20aa..0617736 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:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" 
-                 xml:id="DFLIPFLOP" xml:lang="fr_FR" xml.mml="http://www.w3.org/1998/Math/MathML">
+<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:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:id="DFLIPFLOP" xml:lang="fr_FR" xml.mml="http://www.w3.org/1998/Math/MathML">
     <refnamediv>
         <refname>DFLIPFLOP</refname>
         <refpurpose>Bascule D</refpurpose>
     </refnamediv>
     <refsection>
         <title>Aperçu</title>
-               <inlinemediaobject>
-                       <imageobject>
-                               <imagedata fileref="../../../../images/palettes/DFLIPFLOP.png" align="center"/>
-                       </imageobject>
-               </inlinemediaobject>
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="../../../../images/palettes/DFLIPFLOP.png" align="center"/>
+            </imageobject>
+        </inlinemediaobject>
     </refsection>
     <refsection id="Contents_DFLIPFLOP">
         <title>Contenu</title>
-               <itemizedlist>
-                       <listitem>
-                               <xref linkend="Description_DFLIPFLOP">Description</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Data_Type_DFLIPFLOP">Types de données</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Defaultproperties_DFLIPFLOP">Propriétés par défaut</xref>
-                       </listitem>
-                       <!--      TODO wait for the bug 8900 resolution http://bugzilla.scilab.org/show_bug.cgi?id=8900
+        <itemizedlist>
+            <listitem>
+                <xref linkend="Description_DFLIPFLOP">Description</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Data_Type_DFLIPFLOP">Types de données</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Defaultproperties_DFLIPFLOP">Propriétés par défaut</xref>
+            </listitem>
+            <!--      TODO wait for the bug 8900 resolution http://bugzilla.scilab.org/show_bug.cgi?id=8900
   <listitem>
-       <xref linkend="Example_DFLIPFLOP">Exemple</xref>
+    <xref linkend="Example_DFLIPFLOP">Exemple</xref>
   </listitem>
 -->
-                       <listitem>
-                               <xref linkend="Interfacingfunction_DFLIPFLOP">Fonction d'interfaçage</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Seealso_DFLIPFLOP">Voir aussi</xref>
-                       </listitem>
-               </itemizedlist>
+            <listitem>
+                <xref linkend="Interfacingfunction_DFLIPFLOP">Fonction d'interfaçage</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Seealso_DFLIPFLOP">Voir aussi</xref>
+            </listitem>
+        </itemizedlist>
     </refsection>
     <refsection id="Description_DFLIPFLOP">
         <title>Description</title>
         <para>
             Ce bloc sort son état d'entrée (<emphasis role="bold">D</emphasis>) quand l'entrée de
-                       validation (<emphasis role="bold">en</emphasis>) est à 1 sur le front montant de l'horloge
+            validation (<emphasis role="bold">en</emphasis>) est à 1 sur le front montant de l'horloge
             <emphasis role="bold">clk</emphasis>. La sortie <emphasis role="bold">!Q</emphasis> est la
             négation logique de <emphasis role="bold">Q</emphasis>.
             Cette bascule est aussi connue comme une bascule de retard puisque l'état de l'entrée n'est
                 </para>
             </listitem>
         </itemizedlist>
-               <para/>
+        <para/>
     </refsection>
     <!--  TODO wait for the bug 8900 resolution http://bugzilla.scilab.org/show_bug.cgi?id=8900
 <refsection id="Example_DFLIPFLOP">
index 3ed93f7..c2d890b 100644 (file)
         <informaltable border="1" cellpadding="2">
             <tr>
                 <td align="left">
-                    <emphasis role="bold">Bits to Extract</emphasis>
+                    <emphasis role="bold">Bits à extraire</emphasis>
                 </td>
                 <td align="left">
-                    <emphasis role="bold">Output</emphasis>
+                    <emphasis role="bold">Sortie</emphasis>
                 </td>
                 <td align="left">
-                    <emphasis role="bold">Number of Bits or Index of Bit</emphasis>
+                    <emphasis role="bold">Nombre de bits ou n° de bit</emphasis>
                 </td>
             </tr>
             <tr>
         <informaltable border="1" cellpadding="3">
             <tr>
                 <td>
-                    <emphasis role="bold">Input</emphasis>
+                    <emphasis role="bold">Entrée</emphasis>
                 </td>
                 <td>
-                    <emphasis role="bold">Bits to Extract</emphasis>
+                    <emphasis role="bold">Bits à extraire</emphasis>
                 </td>
                 <td>
-                    <emphasis role="bold">Number of Bits or Index of Bit</emphasis>
+                    <emphasis role="bold">Nombre de bits ou n° de bit</emphasis>
                 </td>
                 <td>
                     <emphasis role="bold">Treat Bit Field as an Integer</emphasis>
                 </td>
                 <td>
-                    <emphasis role="bold">Output</emphasis>
+                    <emphasis role="bold">Sortie</emphasis>
                 </td>
             </tr>
             <tr>
index 451bf63..3c7f1dd 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:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" 
-                 xml:id="LOGIC" xml:lang="fr_FR" xml.mml="http://www.w3.org/1998/Math/MathML">
+<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:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:id="LOGIC" xml:lang="fr_FR" xml.mml="http://www.w3.org/1998/Math/MathML">
     <refnamediv>
         <refname>LOGIC</refname>
         <refpurpose>Logique combinatoire</refpurpose>
     </refnamediv>
     <refsection>
         <title>Aperçu</title>
-               <inlinemediaobject>
-                       <imageobject>
-                               <imagedata fileref="../../../../images/palettes/LOGIC.png" align="center"/>
-                       </imageobject>
-               </inlinemediaobject>
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="../../../../images/palettes/LOGIC.png" align="center"/>
+            </imageobject>
+        </inlinemediaobject>
     </refsection>
     <refsection id="Contents_LOGIC">
         <title>Contenu</title>
-               <itemizedlist>
-                       <listitem>
-                               <xref linkend="Description_LOGIC">Description</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Data_Type_LOGIC">Types de données</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Dialogbox_LOGIC">Paramètres</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Defaultproperties_LOGIC">Propriétés par défaut</xref>
-                       </listitem>
-                       <listitem>
-                               <link linkend="Examples_LOGIC">Exemples</link>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Interfacingfunction_LOGIC">Fonction d'interfaçage</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Computationalfunction_LOGIC">Fonction de calcul</xref>
-                       </listitem>
-                       <listitem>
-                               <xref linkend="Seealso_LOGIC">Voir aussi</xref>
-                       </listitem>
-               </itemizedlist>
+        <itemizedlist>
+            <listitem>
+                <xref linkend="Description_LOGIC">Description</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Data_Type_LOGIC">Types de données</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Dialogbox_LOGIC">Paramètres</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Defaultproperties_LOGIC">Propriétés par défaut</xref>
+            </listitem>
+            <listitem>
+                <link linkend="Examples_LOGIC">Exemples</link>
+            </listitem>
+            <listitem>
+                <xref linkend="Interfacingfunction_LOGIC">Fonction d'interfaçage</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Computationalfunction_LOGIC">Fonction de calcul</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Seealso_LOGIC">Voir aussi</xref>
+            </listitem>
+        </itemizedlist>
     </refsection>
     <refsection id="Description_LOGIC">
         <title>Description</title>
@@ -81,8 +81,8 @@
                 </para>
                 <para/>
                 <para>
-                                       <emphasis>Nombre de lignes =
-                                       2<superscript>(nombre d'entrées)</superscript></emphasis>
+                    <emphasis>Nombre de lignes =
+                    2<superscript>(nombre d'entrées)</superscript></emphasis>
                 </para>
                 <para/>
             </listitem>
     </refsection>
     <refsection id="Dialogbox_LOGIC">
         <title>Paramètres</title>
-               <inlinemediaobject>
-                       <imageobject>
-                               <imagedata fileref="../../../gui/integer_pal/fr_FR/LOGIC_gui.png"
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="../../../gui/integer_pal/fr_FR/LOGIC_gui.png"
                             align="center" style="float:right"/>
                 <!-- align => Javahelp, style => Online -->
-                       </imageobject>
-               </inlinemediaobject>
+            </imageobject>
+        </inlinemediaobject>
         <itemizedlist>
             <listitem>
                 <para>
                 </para>
             </listitem>
         </itemizedlist>
-               <para/>
+        <para/>
     </refsection>
     <refsection id="Examples_LOGIC">
         <title>Exemples</title>
-        <refsection id="Example_1_LOGIC">
+        <refsect3 id="Example_1_LOGIC">
             <title>Exemple 1</title>
             <para>
                 L'exemple le plus simple à considérer est le OR. Dans ce cas nous avons deux entrées et seulement une sortie. La table
             </para>
             <para/>
             <programlisting role="example"><![CDATA[[0;1;1;1]]]></programlisting>
-  </refsection>
-  <refsection id="Example_2_LOGIC">
-    <title>Exemple 2</title>
-    <para>
-      Cet exemple montre l'utilisation du bloc LOGIC en tant que démultiplexeur. Le but est d'envoyer l'entrée constante égale
-      à vrai sur une des quatre sorties en accord avec l'état des deux entrées de sélection :
-      <emphasis><literal>a</literal></emphasis> et <emphasis><literal>b</literal></emphasis>.
-      La table de vérité est la suivante :
-    </para>
-    <para/>
-    <informaltable border="1" cellpadding="3">
-      <tr>
-        <td>
-          <emphasis role="bold">Constant</emphasis>
-        </td>
-        <td>
-          <emphasis role="bold">a</emphasis>
-        </td>
-        <td>
-          <emphasis role="bold">b</emphasis>
-        </td>
-        <td>
-          <emphasis role="bold">Q0</emphasis>
-        </td>
-        <td>
-          <emphasis role="bold">Q1</emphasis>
-        </td>
-        <td>
-          <emphasis role="bold">Q2</emphasis>
-        </td>
-        <td>
-          <emphasis role="bold">Q3</emphasis>
-        </td>
-      </tr>
-      <tr><td>0</td><td>X</td><td>X</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
-      <tr><td>1</td><td>0</td><td>0</td><td>1</td><td>0</td><td>0</td><td>0</td></tr>
-      <tr><td>1</td><td>0</td><td>1</td><td>0</td><td>1</td><td>0</td><td>0</td></tr>
-      <tr><td>1</td><td>1</td><td>0</td><td>0</td><td>0</td><td>1</td><td>0</td></tr>
-      <tr><td>1</td><td>1</td><td>1</td><td>0</td><td>0</td><td>0</td><td>1</td></tr>
-    </informaltable>
-    <para>où <emphasis><literal>X</literal></emphasis> signifie "indifférent".</para>
-    <para>
-      Pour mettre cette table dans le paramètre <emphasis role="bold">Truth Table</emphasis>, on peut simplement écrire :
-    </para>
-    <para/>
-    <programlisting role="example"><![CDATA[
-      [zeros(4,4) ; eye(4,4)]
-    ]]></programlisting>
-               <para/>
-               <para>
-                       La figure suivante montre les sorties
-                       <emphasis><literal>Q<subscript>0</subscript></literal></emphasis>
-                       à <emphasis><literal>Q<subscript>3</subscript></literal></emphasis>
-                       obtenues pendant la simulation quand les entrées
-                       <emphasis><literal>a</literal></emphasis>
-                       et <emphasis><literal>b</literal></emphasis>
-                       de sélection du bloc sont générées par un compteur binaire.
-               </para>
-               <para>
-                       <link type="scilab" linkend="scilab.xcos/xcos/examples/integer_pal/fr_FR/LOGIC_fr_FR.zcos">
-                               <inlinemediaobject>
-                                       <imageobject>
-                                               <imagedata fileref="../../../../examples/integer_pal/fr_FR/LOGIC_fr_FR.zcos" align="center" valign="middle"/>
-                                       </imageobject>
-                               </inlinemediaobject>
-                       </link>
-               </para>
-               <scilab:image localized="true"><![CDATA[
+              </refsect3>
+              <refsect3 id="Example_2_LOGIC">
+                <title>Exemple 2</title>
+                <para>
+                  Cet exemple montre l'utilisation du bloc LOGIC en tant que démultiplexeur. Le but est d'envoyer l'entrée constante égale
+                  à vrai sur une des quatre sorties en accord avec l'état des deux entrées de sélection :
+                  <emphasis><literal>a</literal></emphasis> et <emphasis><literal>b</literal></emphasis>.
+                  La table de vérité est la suivante :
+                </para>
+                <para/>
+                <informaltable border="1" cellpadding="3">
+                  <tr>
+                    <td>
+                      <emphasis role="bold">Constant</emphasis>
+                    </td>
+                    <td>
+                      <emphasis role="bold">a</emphasis>
+                    </td>
+                    <td>
+                      <emphasis role="bold">b</emphasis>
+                    </td>
+                    <td>
+                      <emphasis role="bold">Q0</emphasis>
+                    </td>
+                    <td>
+                      <emphasis role="bold">Q1</emphasis>
+                    </td>
+                    <td>
+                      <emphasis role="bold">Q2</emphasis>
+                    </td>
+                    <td>
+                      <emphasis role="bold">Q3</emphasis>
+                    </td>
+                  </tr>
+                  <tr><td>0</td><td>X</td><td>X</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+                  <tr><td>1</td><td>0</td><td>0</td><td>1</td><td>0</td><td>0</td><td>0</td></tr>
+                  <tr><td>1</td><td>0</td><td>1</td><td>0</td><td>1</td><td>0</td><td>0</td></tr>
+                  <tr><td>1</td><td>1</td><td>0</td><td>0</td><td>0</td><td>1</td><td>0</td></tr>
+                  <tr><td>1</td><td>1</td><td>1</td><td>0</td><td>0</td><td>0</td><td>1</td></tr>
+                </informaltable>
+                <para>où <emphasis><literal>X</literal></emphasis> signifie "indifférent".</para>
+                <para>
+                  Pour mettre cette table dans le paramètre <emphasis role="bold">Truth Table</emphasis>, on peut simplement écrire :
+                </para>
+                <para/>
+                <programlisting role="example"><![CDATA[
+                  [zeros(4,4) ; eye(4,4)]
+                ]]></programlisting>
+                    <para/>
+                    <para>
+                        La figure suivante montre les sorties
+                        <emphasis><literal>Q<subscript>0</subscript></literal></emphasis>
+                        à <emphasis><literal>Q<subscript>3</subscript></literal></emphasis>
+                        obtenues pendant la simulation quand les entrées
+                        <emphasis><literal>a</literal></emphasis>
+                        et <emphasis><literal>b</literal></emphasis>
+                        de sélection du bloc sont générées par un compteur binaire.
+                    </para>
+                    <para>
+                        <link type="scilab" linkend="scilab.xcos/xcos/examples/integer_pal/fr_FR/LOGIC_fr_FR.zcos">
+                            <inlinemediaobject>
+                                <imageobject>
+                                    <imagedata fileref="../../../../examples/integer_pal/fr_FR/LOGIC_fr_FR.zcos" align="center" valign="middle"/>
+                                </imageobject>
+                            </inlinemediaobject>
+                        </link>
+                    </para>
+                    <scilab:image localized="true"><![CDATA[
 importXcosDiagram(SCI + "/modules/xcos/examples/integer_pal/fr_FR/LOGIC_fr_FR.zcos");
 xcos_simulate(scs_m, 4);
 ]]></scilab:image>
-        </refsection>
+        </refsect3>
     </refsection>
     <refsection id="Interfacingfunction_LOGIC">
         <title>Fonction d'interfaçage</title>
index 846ae88..9edf0a4 100644 (file)
                 </para>
             </listitem>
         </itemizedlist>
-        <para/>
     </refsection>
     <refsection id="Example_SHIFT">
         <title>Exemple</title>
index 6082219..47fc3a6 100644 (file)
         <title>Voir aussi</title>
         <itemizedlist>
             <listitem>
-                <link linkend="MATSUM">MATSUM - Somme des éléments d'une matrice (Block Xcos)</link>
+                <link linkend="MATSUM">MATSUM</link>
             </listitem>
             <listitem>
                 <link linkend="cumsum">cumsum (Fonction Scilab)</link>
index 48cf068..f910ce4 100644 (file)
     <refsection id="Example_CLKOUTV_f">
         <title>Exemple</title>
         <para>
-            Le Super block ci-dessous est principalement un diviseur de fréquence par 4, associé à une génération d'événement à l'instant
+            Le Super-bloc ci-dessous est principalement un diviseur de fréquence par 4, associé à une génération d'événement à l'instant
             <emphasis>
                 <literal>t = 3 s</literal>
             </emphasis>
index fd4917b..09e112d 100644 (file)
     <refsection id="Description_INIMPL_f">
         <title>Description</title>
         <para>
-            Ce bloc représente une port d'entrée implicite. Il doit être utilisé uniquement à l'intérieur d'un Super bloc Xcos et être connecté une entrée implicite dans le sous-système.
+            Ce bloc représente une port d'entrée implicite. Il doit être utilisé uniquement à
+            l'intérieur d'un Super-bloc Xcos et être connecté une entrée implicite dans le sous-système.
         </para>
         <para>
-            Ce bloc est une liaison de signal d'un système dans un sous-système. Dans un Super bloc, les ports d'entrée implicites
-            doivent être numérotés de 1 au nombre total d'entrées implicites du Super bloc. Chaque numéro d'entrée implicite doit être
+            Ce bloc est une liaison de signal d'un système dans un sous-système.
+            Dans un Super-bloc, les ports d'entrée implicites doivent être numérotés de 1 au nombre
+            total d'entrées implicites du Super bloc. Chaque numéro d'entrée implicite doit être
             unique et défini avec le paramètre <emphasis role="bold">Port number</emphasis>.
         </para>
     </refsection>
     <refsection id="Example_INIMPL_f">
         <title>Exemple</title>
         <para>
-            L'exemple suivant montre l'utilisation du bloc INIMPL_f. Le Super bloc contient un
+            L'exemple suivant montre l'utilisation du bloc INIMPL_f. Le Super-bloc contient un
             circuit électrique simple avec deux entrées, une sur la résistance, l'autre pour la masse.
             Ces entrées sont connectées à l'environnement extérieur du bloc à travers deux blocs
-            INIMPL_f numérotés 1 et 2. La sortie du Super block est connectée via le bloc
+            INIMPL_f numérotés 1 et 2. La sortie du Super-bloc est connectée via le bloc
             <link linkend="OUTIMPL_f">OUTIMPL_f</link>.
         </para>
         <para>
diff --git a/scilab/modules/xcos/help/fr_FR/palettes/Signalprocessing_pal/SAMPHOLD_m.xml b/scilab/modules/xcos/help/fr_FR/palettes/Signalprocessing_pal/SAMPHOLD_m.xml
new file mode 100644 (file)
index 0000000..c8baca4
--- /dev/null
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scicos
+ *
+ * Copyright (C) INRIA - METALAU Project <scicos@inria.fr> (HTML version)
+ * Copyright (C) DIGITEO - Scilab Consortium (XML Docbook version)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * See the file ./license.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:id="SAMPHOLD_m" xml:lang="fr_FR">
+    <refnamediv>
+        <refname>SAMPHOLD_m</refname>
+        <refpurpose>Echantillonneur - bloqueur</refpurpose>
+    </refnamediv>
+    <refsection>
+        <title>Aperçu</title>
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="../../../../images/palettes/SAMPHOLD_m.png" align="center"/>
+            </imageobject>
+        </inlinemediaobject>
+    </refsection>
+
+    <refsection id="Contents_SAMPHOLD_m">
+        <title>Contenu</title>
+        <itemizedlist>
+            <listitem>
+                <xref linkend="Description_SAMPHOLD_m">Description</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Dialogbox_SAMPHOLD_m">Paramètres</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Defaultproperties_SAMPHOLD_m">Propriétés par défaut</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Example_SAMPHOLD_m">Exemple</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Interfacingfunction_SAMPHOLD_m">Fonction d'interfaçage</xref>
+            </listitem>
+            <listitem>
+                <xref linkend="Computationalfunction_SAMPHOLD_m">Fonction de calcul</xref>
+            </listitem>
+        </itemizedlist>
+    </refsection>
+
+    <refsection id="Description_SAMPHOLD_m">
+        <title>Description</title>
+        <para>
+            Each time an input event is received block copy its input on the
+            output and hold it until input event. For periodic Sample and hold,
+            event input must be generated by a <emphasis role="bold">Clock</emphasis>.
+        </para>
+    </refsection>
+
+    <refsection id="Dialogbox_SAMPHOLD_m">
+        <title>Paramètres</title>
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="../../../../images/gui/SAMPHOLD_m_gui.gif" align="center" style="float:right"/>
+                    <!-- align => Javahelp, style => Online -->
+            </imageobject>
+        </inlinemediaobject>
+        <itemizedlist>
+            <listitem>
+                <para>
+                    <emphasis role="bold">Datatype(1=real double 2=Complex 3=int32 ...)</emphasis>
+                </para>
+                <para> Output datatype. Tous les types de données sont acceptés.</para>
+                <para> Propriétés : Type 'vec' de taille 1.</para>
+            </listitem>
+        </itemizedlist>
+    </refsection>
+    <refsection id="Defaultproperties_SAMPHOLD_m">
+        <title>Propriétés par défaut</title>
+        <itemizedlist>
+            <listitem>
+                <para>
+                    <emphasis role="bold">always active:</emphasis> non
+                </para>
+            </listitem>
+            <listitem>
+                <para>
+                    <emphasis role="bold">direct-feedthrough:</emphasis> oui
+                </para>
+            </listitem>
+            <listitem>
+                <para>
+                    <emphasis role="bold">zero-crossing:</emphasis> non
+                </para>
+            </listitem>
+            <listitem>
+                <para>
+                    <emphasis role="bold">mode:</emphasis> non
+                </para>
+            </listitem>
+            <listitem>
+                <para>
+                    <emphasis role="bold">regular inputs:</emphasis>
+                </para>
+                <para>
+                    <emphasis role="bold">- port 1 : taille [-1,-2] / type 1</emphasis>
+                </para>
+            </listitem>
+            <listitem>
+                <para>
+                    <emphasis role="bold">regular outputs:</emphasis>
+                </para>
+                <para>
+                    <emphasis role="bold">- port 1 : taille [-1,-2] / type 1</emphasis>
+                </para>
+            </listitem>
+            <listitem>
+                <para>
+                    <emphasis role="bold">number/sizes of activation inputs:</emphasis> 1
+                </para>
+            </listitem>
+            <listitem>
+                <para>
+                    <emphasis role="bold">number/sizes of activation outputs:</emphasis> 0
+                </para>
+            </listitem>
+            <listitem>
+                <para>
+                    <emphasis role="bold">continuous-time state:</emphasis> non
+                </para>
+            </listitem>
+            <listitem>
+                <para>
+                    <emphasis role="bold">discrete-time state:</emphasis> non
+                </para>
+            </listitem>
+            <listitem>
+                <para>
+                    <emphasis role="bold">object discrete-time state:</emphasis> non
+                </para>
+            </listitem>
+            <listitem>
+                <para>
+                    <emphasis role="bold">name of computational function:</emphasis>
+                    <emphasis role="italic">samphold4_m</emphasis>
+                </para>
+            </listitem>
+        </itemizedlist>
+        <para/>
+    </refsection>
+    <refsection id="Example_SAMPHOLD_m">
+        <title>Exemple</title>
+        <para>
+            <link type="scilab" linkend="scilab.xcos/xcos/examples/signalprocessing_pal/SAMPHOLD_m_Example.zcos">
+                <inlinemediaobject>
+                    <imageobject>
+                        <imagedata align="center" fileref="../../../../examples/signalprocessing_pal/SAMPHOLD_m_Example.zcos"/>
+                    </imageobject>
+                </inlinemediaobject>
+            </link>
+        </para>
+    </refsection>
+    <refsection id="Interfacingfunction_SAMPHOLD_m">
+        <title>Fonction d'interfaçage</title>
+        <itemizedlist>
+            <listitem>
+                <para> SCI/modules/scicos_blocks/macros/Linear/SAMPHOLD_m.sci</para>
+            </listitem>
+        </itemizedlist>
+    </refsection>
+    <refsection id="Computationalfunction_SAMPHOLD_m">
+        <title>Fonction de calcul</title>
+        <itemizedlist>
+            <listitem>
+                <para> SCI/modules/scicos_blocks/src/c/samphold4_m.c (Type 4)</para>
+            </listitem>
+        </itemizedlist>
+    </refsection>
+</refentry>
index 680949c..2657b76 100644 (file)
@@ -88,7 +88,7 @@ box "Champ #N";
         <para>
             Le paramètre <emphasis role="bold">Time record Selection</emphasis> permet à
             l'utilisateur de sélectionner un champ de l'enregistrement qui représente des événements
-            temporels. Quand ce paramètre est fourni, une sortie d'activation est ajoutée au block
+            temporels. Quand ce paramètre est fourni, une sortie d'activation est ajoutée au bloc
             qui renvoie ces événements à l'utilisateur. Vous pouvez effectuer un bouclage
             de la sortie d'activation sur l'entrée d'événement du bloc pour lire les
             enregistrements en séquence jusqu'à la fin du fichier comme dans l'exemple ci-dessous.
index 61a293f..b953528 100644 (file)
@@ -73,7 +73,7 @@
                 </imageobject>
             </mediaobject>
         </informalequation>
-        ただし, y0 は初期条件, t0 は対応する時間です.
+        ただし, y<subscript>0</subscript> は初期条件, t<subscript>0</subscript> は対応する時間です.
     </refsection>
     <refsection id="Dialogbox_INTEGRAL_m">
         <title>ダイアログボックス</title>
                 </para>
             </listitem>
         </itemizedlist>
-        <para/>
     </refsection>
     <refsection id="Interfacingfunction_INTEGRAL_m">
         <title>インターフェイス用関数</title>
     </refsection>
     <refsection id="Examples_INTEGRAL_m">
         <title>例</title>
-        <refsection id="Example_INTEGRAL_m_1">
+        <refsect3 id="Example_INTEGRAL_m_1">
             <title>例1</title>
             <para>この例のモデルは積分器の状態ポートの使用例を示します.
             </para>
@@ -286,8 +285,8 @@ importXcosDiagram(SCI + "/modules/xcos/examples/continuous_pal/INTEGRAL_m_1_Exam
 xcos_simulate(scs_m, 4);
 ]]></scilab:image>
             </para>
-        </refsection>
-        <refsection id="Example_INTEGRAL_m_2">
+        </refsect3>
+        <refsect3 id="Example_INTEGRAL_m_2">
             <title>例2</title>
             <para>
                 <link type="scilab" linkend="scilab.xcos/xcos/examples/continuous_pal/INTEGRAL_m_2_Example.zcos">
@@ -302,6 +301,6 @@ importXcosDiagram(SCI + "/modules/xcos/examples/continuous_pal/INTEGRAL_m_2_Exam
 xcos_simulate(scs_m, 4);
 ]]></scilab:image>
             </para>
-        </refsection>
+        </refsect3>
     </refsection>
 </refentry>
index 7befbd2..cc7f7b9 100644 (file)
     </refsection>
     <refsection id="Examples_PID">
         <title>例</title>
-        <refsection id="Example_1_PID">
+        <refsect3 id="Example_1_PID">
             <title>例1</title>
             <para>
                 この例は,PIDレギュレータの使用例を示します.
                         </imageobject>
                     </inlinemediaobject>
                 </link>
+            </para>
+            <para>
                 <scilab:image><![CDATA[
 importXcosDiagram(SCI + "/modules/xcos/examples/continuous_pal/PID_1_Example.zcos");
 xcos_simulate(scs_m, 4);
 ]]></scilab:image>
             </para>
-        </refsection>
-        <refsection id="Example_2_PID">
+        </refsect3>
+        <refsect3 id="Example_2_PID">
             <title>例2</title>
             <para>
                 <link type="scilab" linkend="scilab.xcos/xcos/examples/continuous_pal/PID_2_Example.zcos">
@@ -300,13 +302,15 @@ xcos_simulate(scs_m, 4);
                         </imageobject>
                     </inlinemediaobject>
                 </link>
+            </para>
+            <para>
                 <scilab:image><![CDATA[
 importXcosDiagram(SCI + "/modules/xcos/examples/continuous_pal/PID_2_Example.zcos");
 xcos_simulate(scs_m, 4);
 ]]></scilab:image>
             </para>
-        </refsection>
-        <refsection id="Example_3_PID">
+        </refsect3>
+        <refsect3 id="Example_3_PID">
             <title>例3</title>
             <para>
                 <link type="scilab" linkend="scilab.xcos/xcos/examples/continuous_pal/PID_3_Example.zcos">
@@ -316,11 +320,13 @@ xcos_simulate(scs_m, 4);
                         </imageobject>
                     </inlinemediaobject>
                 </link>
+            </para>
+            <para>
                 <scilab:image><![CDATA[
 importXcosDiagram(SCI + "/modules/xcos/examples/continuous_pal/PID_3_Example.zcos");
 xcos_simulate(scs_m, 4);
 ]]></scilab:image>
             </para>
-        </refsection>
+        </refsect3>
     </refsection>
 </refentry>