Help generation: Improve log messages and fix bugs in xml 07/10807/2
Calixte DENIZET [Wed, 13 Mar 2013 15:03:54 +0000 (16:03 +0100)]
Change-Id: I2e7385aa940b45a728c49ac3a7275bd6a8669b15

62 files changed:
scilab/modules/cacsd/help/ja_JP/plot_display/m_circle.xml
scilab/modules/elementary_functions/help/en_US/elementarymatrices/logspace.xml
scilab/modules/elementary_functions/help/en_US/floating_point/number_properties.xml
scilab/modules/elementary_functions/help/fr_FR/elementarymatrices/logspace.xml
scilab/modules/elementary_functions/help/ja_JP/elementarymatrices/logspace.xml
scilab/modules/elementary_functions/help/ja_JP/floating_point/number_properties.xml
scilab/modules/elementary_functions/help/pt_BR/elementarymatrices/logspace.xml
scilab/modules/elementary_functions/help/pt_BR/floating_point/number_properties.xml
scilab/modules/elementary_functions/help/ru_RU/floating_point/ceil.xml
scilab/modules/elementary_functions/help/ru_RU/floating_point/floor.xml
scilab/modules/elementary_functions/help/ru_RU/floating_point/number_properties.xml
scilab/modules/graphics/help/ru_RU/2d_plot/contour2d.xml
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/images/Graphics_36.png [deleted file]
scilab/modules/helptools/images/Graphics_37.png [deleted file]
scilab/modules/helptools/images/Graphics_38.png [deleted file]
scilab/modules/helptools/images/Graphics_39.png [deleted file]
scilab/modules/helptools/images/Graphics_40.png [deleted file]
scilab/modules/helptools/images/Graphics_41.png [deleted file]
scilab/modules/helptools/images/Graphics_42.png [deleted file]
scilab/modules/helptools/images/Graphics_en_US_42.png
scilab/modules/helptools/images/Graphics_fr_FR_42.png
scilab/modules/helptools/images/Graphics_ja_JP_36.png
scilab/modules/helptools/images/Graphics_ja_JP_37.png
scilab/modules/helptools/images/Graphics_ja_JP_38.png
scilab/modules/helptools/images/Graphics_ja_JP_40.png
scilab/modules/helptools/images/Graphics_ja_JP_41.png
scilab/modules/helptools/images/Sfgrayplot_1.png
scilab/modules/helptools/images/Sfgrayplot_2.png
scilab/modules/helptools/images/Sfgrayplot_3.png
scilab/modules/helptools/images/Sfgrayplot_4.png [deleted file]
scilab/modules/helptools/images/Sgrayplot_1.png
scilab/modules/helptools/images/_LaTeX_ceil.xml_ru_RU_1.png [moved from scilab/modules/helptools/images/_LaTeX_ceil.xml_1.png with 100% similarity]
scilab/modules/helptools/images/_LaTeX_floor.xml_ru_RU_1.png [moved from scilab/modules/helptools/images/_LaTeX_floor.xml_1.png with 100% similarity]
scilab/modules/helptools/images/_LaTeX_grand.xml_1.png
scilab/modules/helptools/images/_LaTeX_number_properties.xml_5.png
scilab/modules/helptools/images/_LaTeX_number_properties.xml_6.png
scilab/modules/helptools/images/_LaTeX_number_properties.xml_8.png [deleted file]
scilab/modules/helptools/images/_LaTeX_number_properties.xml_9.png [deleted file]
scilab/modules/helptools/images/champ1_1.png
scilab/modules/helptools/images/cheb2mag_1.png
scilab/modules/helptools/images/contour2d_2.png
scilab/modules/helptools/images/contour2d_ru_RU_3.png [moved from scilab/modules/helptools/images/contour2d_3.png with 100% similarity]
scilab/modules/helptools/images/contourf_1.png
scilab/modules/helptools/images/grayplot_1.png
scilab/modules/helptools/images/histplot_1.png
scilab/modules/helptools/images/m_circle_ja_JP_1.png [moved from scilab/modules/helptools/images/m_circle_1.png with 100% similarity]
scilab/modules/helptools/images/m_circle_ja_JP_2.png [moved from scilab/modules/helptools/images/m_circle_2.png with 100% similarity]
scilab/modules/helptools/images/mesh_1.png
scilab/modules/helptools/images/plot_7.png
scilab/modules/helptools/images/xstringb_1.png
scilab/modules/helptools/images/xstringl_1.png
scilab/modules/helptools/src/java/org/scilab/modules/helptools/DocbookTagConverter.java
scilab/modules/helptools/src/java/org/scilab/modules/helptools/HTMLDocbookTagConverter.java
scilab/modules/helptools/src/java/org/scilab/modules/helptools/external/ExternalXMLHandler.java
scilab/modules/helptools/src/java/org/scilab/modules/helptools/external/HTMLMathMLHandler.java
scilab/modules/helptools/src/java/org/scilab/modules/helptools/external/HTMLSVGHandler.java
scilab/modules/helptools/src/java/org/scilab/modules/helptools/external/HTMLScilabHandler.java
scilab/modules/helptools/src/java/org/scilab/modules/helptools/image/ImageConverter.java
scilab/modules/helptools/src/java/org/scilab/modules/helptools/image/ScilabImageConverter.java
scilab/modules/signal_processing/help/en_US/filters/cheb2mag.xml
scilab/modules/signal_processing/help/ja_JP/filters/cheb2mag.xml

index 663f935..5d2dad9 100644 (file)
@@ -124,16 +124,11 @@ nyquist(h,0.01,100,'(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01)')
 m_circle();
 ]]></programlisting>
         
-        <scilab:image>
-            
+        <scilab:image localized="true">
             s=poly(0,'s')
-            
             h=syslin('c',(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01))
-            
             nyquist(h,0.01,100,'(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01)')
-            
             m_circle();
-            
         </scilab:image>
         
         
@@ -147,20 +142,13 @@ nyquist([h1;h],0.01,100,['h1';'h'])
 m_circle([-8 -6 -4]);
 ]]></programlisting>
         
-        <scilab:image>
-            
+        <scilab:image localized="true">
             clf();
-            
             s=poly(0,'s')
-            
             h=syslin('c',(s^2+2*0.9*10*s+100)/(s^2+2*0.3*10.1*s+102.01))
-            
             h1=h*syslin('c',(s^2+2*0.1*15.1*s+228.01)/(s^2+2*0.9*15*s+225))
-            
             nyquist([h1;h],0.01,100,['h1';'h'])
-            
             m_circle([-8 -6 -4]);
-            
         </scilab:image>
         
     </refsection>
index e17c0b6..b801886 100644 (file)
@@ -42,9 +42,9 @@
         <title>Description</title>
         <para>
             returns a row vector of <literal>n</literal> logarithmically equally
-            spaced points between <literal>10^d1</literal> and
-            <literal>10^d2</literal>. If <literal>d2=%pi</literal> then the points are
-            between <literal>10^d1</literal> and <literal>pi</literal>.
+            spaced points between <latex>10^{d1}</latex> and
+            <latex>10^{d2}</latex>. If <literal>d2=%pi</literal> then the points are
+            between <latex>10^{d1}</latex> and <latex>\pi</latex>.
         </para>
     </refsection>
     <refsection>
index 527ab81..e8c3569 100644 (file)
@@ -40,13 +40,15 @@ sign * m * b^e
             <literal>e</literal> is the exponent and <literal>m</literal> the
             mantissa:
         </para>
-        <programlisting><![CDATA[ 
-m = d_1 b^(-1) + d_2 b^(-2) + .... + d_p b^(-p)
- ]]></programlisting>
+        <latex>
+            $$
+            m = d_1 \cdot b^{-1} + d_2 \cdot b^{-2} + \ldots + d_p \cdot b^{-p}
+            $$
+        </latex>
         <para>
-            <literal>d_i</literal> the digits are in <literal>[0, b-1]</literal>
+            <latex>$d_i$</latex> the digits are in <literal>[0, b-1]</literal>
             and <literal>e</literal> in <literal>[emin, emax]</literal>, the number is
-            said "normalised" if <literal>d_1 ~= 0</literal>. The following may be
+            said "normalised" if <latex>$d_1 \neq 0$</latex>. The following may be
             gotten:
         </para>
         <variablelist>
@@ -109,7 +111,7 @@ m = d_1 b^(-1) + d_2 b^(-2) + .... + d_p b^(-p)
                 <listitem>
                     <para>
                         then <literal>pr</literal> is the epsilon machine ( generally
-                        (<literal>b^(1-p))/2</literal> ) which is the relative max error
+                        (<latex>$\dfrac{b^{1-p}}{2}$</latex>) which is the relative max error
                         between a real <literal>x</literal> (such than
                         <literal>|x|</literal> in <literal>[tiny, huge]</literal>) and
                         <literal>fl(x)</literal>, its floating point approximation in
@@ -141,13 +143,9 @@ m = d_1 b^(-1) + d_2 b^(-2) + .... + d_p b^(-p)
             parameters (the names (radix, digit, huge, etc...) are those recommended
             by the LIA 1 standard and are different from the corresponding lapack's
             ones) ; CAUTION: sometimes you can see the following definition for the
-            epsilon machine : <literal>eps = b^(1-p)</literal> but in this function we
-            use the traditional one (see prop = "eps" before) and so <literal>eps =
-                (b^(1-p))/2
-            </literal>
-            if normal rounding occurs and <literal>eps =
-                b^(1-p)
-            </literal>
+            epsilon machine : <latex>$eps = b^{1-p}$</latex> but in this function we
+            use the traditional one (see prop = "eps" before) and so <latex>$eps = \dfrac{b^{1-p}}{2}$</latex>
+            if normal rounding occurs and <latex>$eps = b^{1-p}$</latex>
             if not.
         </para>
     </refsection>
index 5a9d15e..4e74481 100644 (file)
         <title>Description</title>
         <para>
             Renvoie un vecteur ligne <literal>n</literal> de valeurs
-            logarithmiquement équidistantes entre <literal>10^d1</literal> et
-            <literal>10^d2</literal>. Si <literal>d2=%pi</literal> alors les valeurs
-            sont comprises entre <literal>10^d1</literal> et
-            <literal>pi</literal>.
+            logarithmiquement équidistantes entre <latex>10^{d1}</latex> et
+            <latex>10^{d2}</latex>. Si <literal>d2=%pi</literal> alors les valeurs
+            sont comprises entre <latex>10^{d1}</latex> et
+            <latex>\pi</latex>.
         </para>
     </refsection>
     <refsection>
index bd7af7e..a994e3a 100644 (file)
     <refsection>
         <title>説明</title>
         <para>
-            <literal>10^d1</literal> および
-            <literal>10^d2</literal>の間に指数的に等しい間隔にとった
+            <latex>10^{d1}</latex> および
+            <latex>10^{d2}</latex>の間に指数的に等しい間隔にとった
             <literal>n</literal>個の点からなる行ベクトルを返します.
             <literal>d2=%pi</literal> の場合,
-            <literal>10^d1</literal> および <literal>pi</literal>の間の
+            <latex>10^{d1}</latex> および <latex>\pi</latex>の間の
             点となります.
         </para>
     </refsection>
index a3ee869..eba65c6 100644 (file)
@@ -40,13 +40,15 @@ sign * m * b^e
         <para>
             <literal>e</literal>は指数, <literal>m</literal> は仮数です:
         </para>
-        <programlisting role=""><![CDATA[ 
-m = d_1 b^(-1) + d_2 b^(-2) + .... + d_p b^(-p)
- ]]></programlisting>
+        <latex>
+            $$
+            m = d_1 \cdot b^{-1} + d_2 \cdot b^{-2} + \ldots + d_p \cdot b^{-p}
+            $$
+        </latex>
         <para>
-            <literal>d_i</literal> の桁は<literal>[0, b-1]</literal>の範囲,
+            <latex>$d_i$</latex> の桁は<literal>[0, b-1]</literal>の範囲,
             <literal>e</literal> は <literal>[emin, emax]</literal>の範囲となり,
-            <literal>d_1 ~= 0</literal>の場合,
+            <latex>$d_1 \neq 0$</latex>の場合,
             数値は"正規化"されます.
             以下の値を取得できます:
         </para>
@@ -111,7 +113,7 @@ m = d_1 b^(-1) + d_2 b^(-2) + .... + d_p b^(-p)
                 <listitem>
                     <para>この場合,
                         <literal>pr</literal> は,機械イプシロン
-                        (通常は <literal>b^(1-p))/2</literal>)となります.
+                        (通常は <latex>$\dfrac{b^{1-p}}{2}$</latex>)となります.
                         機械イプシロンは,
                         (<literal>|x|</literal> が <literal>[tiny, huge]</literal>の範囲にあるような)
                         <literal>x</literal>と<literal>F</literal>における
@@ -145,15 +147,11 @@ m = d_1 b^(-1) + d_2 b^(-2) + .... + d_p b^(-p)
             (名前 (radix, digit, huge, など...) は LIA 1 規格で推奨されたもので,
             対応する Lapack の定義とは異なっています) ;
             注意: 機械イプシロンに関して以下のような定義を見ることが
-            あるはずです: <literal>eps = b^(1-p)</literal>
+            あるはずです: <latex>$eps = b^{1-p}$</latex>
             しかし, この関数では伝統的な定義 (前記のprop = "eps"を参照)を
             使用しており,
-            このため,通常の丸めが発生する場合に<literal>eps =
-                (b^(1-p))/2
-            </literal>
-            ,そうでない場合に<literal>eps =
-                b^(1-p)
-            </literal>
+            このため,通常の丸めが発生する場合に<latex>$eps = \dfrac{b^{1-p}}{2}$</latex>
+            ,そうでない場合に <latex>$eps = b^{1-p}$</latex>
             となります.
         </para>
     </refsection>
index 380cb41..a3ece12 100644 (file)
@@ -42,9 +42,9 @@
         <title>Descrição</title>
         <para>
             Retorna um vetor linha de <literal>n</literal> pontos espaçados
-            logaritmicamente de maneira igual entre <literal>10^d1</literal> e
-            <literal>10^d2</literal>. Se <literal>d2=%pi</literal> então os pontos
-            estão entre <literal>10^d1</literal> e <literal>pi</literal>.
+            logaritmicamente de maneira igual entre <latex>10^{d1}</latex> e
+            <latex>10^{d2}</latex>. Se <literal>d2=%pi</literal> então os pontos
+            estão entre <latex>10^{d1}</latex> e <latex>\pi</latex>.
         </para>
     </refsection>
     <refsection>
index bb19408..fac3a7e 100644 (file)
             <literal>e</literal> é o expoente e <literal>m</literal> a
             mantissa:
         </para>
-        <programlisting><![CDATA[ 
-     m = d_1 b^(-1) + d_2 b^(-2) + .... + d_p b^(-p)
- ]]></programlisting>
+        <latex>
+            $$
+            m = d_1 \cdot b^{-1} + d_2 \cdot b^{-2} + \ldots + d_p \cdot b^{-p}
+            $$
+        </latex>
         <para>
-            <literal>d_i</literal> os dígitos estão em <literal>[0,
+            <latex>$d_i$</latex> os dígitos estão em <literal>[0,
                 b-1]
             </literal>
             e<literal>e</literal> em <literal>[emin, emax]</literal>,
-            o número é dito "normalizado" se <literal>d_1 ~= 0</literal>. Os seguintes
+            o número é dito "normalizado" se <latex>$d_1 \neq 0$</latex>. Os seguintes
             podem ser recebidos: 
         </para>
         <variablelist>
                 <listitem>
                     <para>
                         então <literal>pr</literal> é a máquina epsilon ( geralmente
-                        (<literal>b^(1-p))/2</literal> ) que é o erro máximo relativo entre
+                        (<latex>$\dfrac{b^{1-p}}{2}$</latex>) que é o erro máximo relativo entre
                         um real <literal>x</literal> (tal que <literal>|x|</literal> está em
                         <literal>[tiny, huge]</literal>) e <literal>fl(x)</literal>, sua
                         aproximação em ponto flutuante em <literal>F</literal>
             parâmetros máquinas (os nomes (radix, digits, huge, etc...) são aqueles
             recomendados pelo padrão LIA 1 e são diferentes daqueles correspondentes
             em LAPACK) ; CUIDADO: às vezes você poderá encontrar a seguinte para a
-            máquina epsilon: <literal>eps = b^(1-p)</literal> , mas nesta função nós
+            máquina epsilon: <latex>$eps = b^{1-p}$</latex>, mas nesta função nós
             usamos a definição tradicional (ver prop = "eps" acima) e então
-            <literal>eps = (b^(1-p))/2</literal> se o arredondamento normal acontecer
-            e <literal>eps = b^(1-p)</literal> se não acontecer.
+            <latex>$eps = \dfrac{b^{1-p}}{2}$</latex> se o arredondamento normal acontecer
+            e <latex>$eps = b^{1-p}$</latex> se não acontecer.
         </para>
     </refsection>
     <refsection>
index 44a0dc8..7c0d89c 100644 (file)
@@ -40,7 +40,7 @@
     <refsection>
         <title>Описание</title>
         <para>
-            <literal>ceil(x)</literal> возвращает матрицу целых чисел, состоящую из элементов, округлённых вверх (в сторону <latex>$+\infty$</latex>).
+            <literal>ceil(x)</literal> возвращает матрицу целых чисел, состоящую из элементов, округлённых вверх (в сторону <latex scilab:localized="true">$+\infty$</latex>).
         </para>
     </refsection>
     <refsection>
index 0fdcefa..d117e9f 100644 (file)
@@ -40,7 +40,7 @@
     <refsection>
         <title>Описание</title>
         <para>
-            <literal>floor(x)</literal> возвращает матрицу целых чисел, округлённых до ближайшего целого числа в сторону <latex>$-\infty$</latex>.
+            <literal>floor(x)</literal> возвращает матрицу целых чисел, округлённых до ближайшего целого числа в сторону <latex scilab:localized="true">$-\infty$</latex>.
         </para>
     </refsection>
     <refsection>
index aea530d..4fa9294 100644 (file)
@@ -117,8 +117,8 @@ sign * m * b^e
                     <para>
                         тогда <literal>pr</literal> является машинным эпсилоном (вообще
                         <latex>$\dfrac{b^{1-p}}{2}$</latex>), которое является относительной
-                        максимальной ошибкой между вещественным <latex>x</latex> (таким,
-                        что <latex>$|x|$</latex> в <literal>[tiny, huge]</literal>) и
+                        максимальной ошибкой между вещественным <literal>x</literal> (таким,
+                        что <literal>|x|</literal> в <literal>[tiny, huge]</literal>) и
                         <literal>fl(x)</literal>, его приближением с плавающей запятой в 
                         <literal>F</literal>
                     </para>
@@ -150,15 +150,11 @@ sign * m * b^e
             Эта функция использует подпрограмму dlamch для получения параметров
             машины (имена (radix, digit, huge и т. д.) рекомендованы стандартом LIA 1
             и отличаются от соответствующих имён lapack); ПРЕДУПРЕЖДЕНИЕ: иногда вы
-            можете увидеть следующее определение машинного эпсилона: <latex>$eps =
-                b^{1-p}$
-            </latex>
+            можете увидеть следующее определение машинного эпсилона: <latex>$eps = b^{1-p}$</latex>
             ,но в этой функции мы используем традиционное определение
-            (см. выше prop = "eps") и поэтому <latex>$eps =
-                \dfrac{b^{1-p}}{2}$
-            </latex>
+            (см. выше prop = "eps") и поэтому <latex>$eps = \dfrac{b^{1-p}}{2}$</latex>
             ,если производится нормальное округление, а
-            если нет, то <latex>$eps =b^{1-p}$</latex>.
+            если нет, то <latex>$eps = b^{1-p}$</latex>.
         </para>
     </refsection>
     <refsection>
index b8ca247..d9851e0 100644 (file)
@@ -69,10 +69,10 @@ z= zmin + (1:nz)*(zmax-zmin)/(nz+1)
  ]]></programlisting>
                                 <para>
                                     <note>
-                                    Заметьте, что уровни <literal>zmin</literal>
-                                    и <literal>zmax</literal> не рисуются
-                                    (вообще, они сводятся в точку), но их можно
-                                    добавить следующим образом:
+                                        Заметьте, что уровни <literal>zmin</literal>
+                                        и <literal>zmax</literal> не рисуются
+                                        (вообще, они сводятся в точку), но их можно
+                                        добавить следующим образом:
                                     </note>
                                 </para>
                                 <programlisting role="no-scilab-exec"><![CDATA[
@@ -150,7 +150,9 @@ plot2d(x(im)',y(jm)',-9,"000")
             <varname>strf</varname>, <varname>leg</varname>,
             <varname>rect</varname>, <varname>nax</varname> могут быть переданы
             в виде последовательности инструкций <literal>key1=value1,
-            key2=value2</literal>,... где ключи <literal>key</literal> могут
+                key2=value2
+            </literal>
+            ,... где ключи <literal>key</literal> могут
             быть <literal>style</literal>, <literal>strf</literal>,
             <literal>leg</literal>, <literal>rect</literal>,
             <literal>nax</literal>. В этом случае порядок не имеет особого значения.
@@ -200,17 +202,17 @@ contour2d(x,x,z,-0.75:0.25:0.75,frameflag=3,rect=[0,0,5*%pi,4*%pi])
 legends(string(-0.75:0.25:0.75),1:7,"lr");
 xtitle("Некоторые уровни кривых функции cos(x)cos(y)")
  ]]></programlisting>
-        <scilab:image>
+        <scilab:image localized="true">
             x = linspace(0,4*%pi,80);
             z = cos(x')*cos(x);
-
+            
             clf(); f=gcf();
             xset("fpf"," ")
-
+            
             f.color_map=jetcolormap(7);
-
+            
             contour2d(x,x,z,-0.75:0.25:0.75,frameflag=3,rect=[0,0,5*%pi,4*%pi])
-
+            
             legends(string(-0.75:0.25:0.75),1:7,"lr");
             xtitle("Некоторые уровни кривых функции cos(x)cos(y)")
         </scilab:image>
index cf9595f..b6c719f 100644 (file)
@@ -303,6 +303,7 @@ _LaTeX_bvode.xml_3.png=67ea98c8b54fcf94a210fcd90e114aa5
 _LaTeX_cdfgam.xml_1.png=fde32f1e0edeb1f6426f9add9e8640a
 _LaTeX_cdfnor.xml_1.png=b86b06522195bfcbfd8f4536dfa11330
 _LaTeX_ceil.xml_1.png=701fa44621fd283e3f2c5468958859d8
+_LaTeX_ceil.xml_ru_RU_1.png=701fa44621fd283e3f2c5468958859d8
 _LaTeX_csc.xml_1.png=95c11e401eed01b86b588b99436708ae
 _LaTeX_csc.xml_2.png=e070fd531e084fbf4de11e4096f5d58
 _LaTeX_cscd.xml_1.png=95c11e401eed01b86b588b99436708ae
@@ -354,6 +355,7 @@ _LaTeX_dst.xml_9.png=55a049b8f161ae7cfeb0197d75aff967
 _LaTeX_fft.xml_1.png=30d788e922f7acbb3ef6f5d2d70bb96b
 _LaTeX_fft.xml_2.png=4b7b41681f5cfbcb0af74e4cc3ab99fc
 _LaTeX_floor.xml_1.png=1d5ba78bbbafd3226f371146bc348363
+_LaTeX_floor.xml_ru_RU_1.png=1d5ba78bbbafd3226f371146bc348363
 _LaTeX_grand.xml_1.png=75aef00d49dd8d9dfff15c7a1bb3d0eb
 _LaTeX_grand.xml_2.png=dd59088e24bed7a6af5a6ccd16e58616
 _LaTeX_grand.xml_3.png=d5a9af412d8ef497e04f99d707a50550
@@ -404,9 +406,9 @@ _LaTeX_number_properties.xml_1.png=e44429416209c43ee6736fc6e4fb475e
 _LaTeX_number_properties.xml_2.png=672a7aeac9254219b9609330a12e55e5
 _LaTeX_number_properties.xml_3.png=e0fec874e861bbf6bd95ae5bdd8df9e3
 _LaTeX_number_properties.xml_4.png=3cbbce1fe1125d9cf1a92243b1091a6
-_LaTeX_number_properties.xml_5.png=9dd4e461268c8034f5c8564e155c67a6
-_LaTeX_number_properties.xml_6.png=b82b509cf285024a5fac5c7a7b0c3e48
-_LaTeX_number_properties.xml_7.png=66b801d2193ad02300431cf30d4a7b41
+_LaTeX_number_properties.xml_5.png=9b14e66e7f791eab3fc3872c25023696
+_LaTeX_number_properties.xml_6.png=bf4a89be3c0a01be7a28b3ac7ae25db7
+_LaTeX_number_properties.xml_7.png=9b14e66e7f791eab3fc3872c25023696
 _LaTeX_number_properties.xml_8.png=48e973afa3a18fef9a18d98d4560db88
 _LaTeX_number_properties.xml_9.png=66b801d2193ad02300431cf30d4a7b41
 _LaTeX_ode.xml_1.png=84ae2f6a526a30f59b67ce587fcd28c9
@@ -558,7 +560,7 @@ champ1_1.png=d2aacf45d80c8edf7c95a54af1533ce4
 champ_1.png=c0e293f757cc87203308abb3d0bd5823
 champ_2.png=83eb5af09a3e46812639bf482ce290e4
 cheb1mag_1.png=3b26f5856ff8a2bcfbcf78e2d77cb5c1
-cheb2mag_1.png=22c857fb2649d2f5735dd698005d572b
+cheb2mag_1.png=d53206e41bccd28401ab6309ce2f941a
 color_1.png=8c94d2cd086d9ccb4ebc994bfd2dcf32
 colorbar_en_US_1.png=ee85d819960bcc1d62e92d25bf660698
 colorbar_en_US_2.png=6dc5d0a74530277a5d477807cd103132
@@ -575,6 +577,7 @@ contour2d_2.png=e618038e4b44d84ce4b6ae2fe5420951
 contour2d_3.png=4c61560bd18df7e242044268caf62b35
 contour2d_en_US_3.png=b210ca5f70b33677912b389f9712db1a
 contour2d_fr_FR_3.png=b210ca5f70b33677912b389f9712db1a
+contour2d_ru_RU_3.png=4c61560bd18df7e242044268caf62b35
 contour_1.png=d285038265f8a3d989244534a70de17a
 contour_2.png=ac789923af59117fd684f6b073e1341a
 contour_3.png=634fbf34f0fd9907ddcf7a2faca80a9f
@@ -742,6 +745,8 @@ m_circle_en_US_1.png=fa39e004c4d8d638d8681a3aee83fcb5
 m_circle_en_US_2.png=3a594b63a3198732615951d46f847501
 m_circle_fr_FR_1.png=fa39e004c4d8d638d8681a3aee83fcb5
 m_circle_fr_FR_2.png=3a594b63a3198732615951d46f847501
+m_circle_ja_JP_1.png=fa39e004c4d8d638d8681a3aee83fcb5
+m_circle_ja_JP_2.png=3a594b63a3198732615951d46f847501
 m_circle_pt_BR_1.png=fa39e004c4d8d638d8681a3aee83fcb5
 m_circle_pt_BR_2.png=3a594b63a3198732615951d46f847501
 m_circle_ru_RU_1.png=fa39e004c4d8d638d8681a3aee83fcb5
diff --git a/scilab/modules/helptools/images/Graphics_36.png b/scilab/modules/helptools/images/Graphics_36.png
deleted file mode 100644 (file)
index 150af30..0000000
Binary files a/scilab/modules/helptools/images/Graphics_36.png and /dev/null differ
diff --git a/scilab/modules/helptools/images/Graphics_37.png b/scilab/modules/helptools/images/Graphics_37.png
deleted file mode 100644 (file)
index 831150e..0000000
Binary files a/scilab/modules/helptools/images/Graphics_37.png and /dev/null differ
diff --git a/scilab/modules/helptools/images/Graphics_38.png b/scilab/modules/helptools/images/Graphics_38.png
deleted file mode 100644 (file)
index d293dcb..0000000
Binary files a/scilab/modules/helptools/images/Graphics_38.png and /dev/null differ
diff --git a/scilab/modules/helptools/images/Graphics_39.png b/scilab/modules/helptools/images/Graphics_39.png
deleted file mode 100644 (file)
index e9256a4..0000000
Binary files a/scilab/modules/helptools/images/Graphics_39.png and /dev/null differ
diff --git a/scilab/modules/helptools/images/Graphics_40.png b/scilab/modules/helptools/images/Graphics_40.png
deleted file mode 100644 (file)
index 98698f2..0000000
Binary files a/scilab/modules/helptools/images/Graphics_40.png and /dev/null differ
diff --git a/scilab/modules/helptools/images/Graphics_41.png b/scilab/modules/helptools/images/Graphics_41.png
deleted file mode 100644 (file)
index 38f1b4e..0000000
Binary files a/scilab/modules/helptools/images/Graphics_41.png and /dev/null differ
diff --git a/scilab/modules/helptools/images/Graphics_42.png b/scilab/modules/helptools/images/Graphics_42.png
deleted file mode 100644 (file)
index 4267ae1..0000000
Binary files a/scilab/modules/helptools/images/Graphics_42.png and /dev/null differ
index 3a4d877..4267ae1 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_en_US_42.png and b/scilab/modules/helptools/images/Graphics_en_US_42.png differ
index 3a4d877..4267ae1 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_fr_FR_42.png and b/scilab/modules/helptools/images/Graphics_fr_FR_42.png differ
index 887b3a4..54b2342 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_ja_JP_36.png and b/scilab/modules/helptools/images/Graphics_ja_JP_36.png differ
index 742e3e2..9c8fbea 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_ja_JP_37.png and b/scilab/modules/helptools/images/Graphics_ja_JP_37.png differ
index 67dcf22..2556df7 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_ja_JP_38.png and b/scilab/modules/helptools/images/Graphics_ja_JP_38.png differ
index 285e0f0..e5d0c88 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_ja_JP_40.png and b/scilab/modules/helptools/images/Graphics_ja_JP_40.png differ
index 43d25cd..465fd70 100644 (file)
Binary files a/scilab/modules/helptools/images/Graphics_ja_JP_41.png and b/scilab/modules/helptools/images/Graphics_ja_JP_41.png differ
index a7bdc02..2336782 100644 (file)
Binary files a/scilab/modules/helptools/images/Sfgrayplot_1.png and b/scilab/modules/helptools/images/Sfgrayplot_1.png differ
index c6a96a8..760e9fa 100644 (file)
Binary files a/scilab/modules/helptools/images/Sfgrayplot_2.png and b/scilab/modules/helptools/images/Sfgrayplot_2.png differ
index eb9ab9c..616a7bb 100644 (file)
Binary files a/scilab/modules/helptools/images/Sfgrayplot_3.png and b/scilab/modules/helptools/images/Sfgrayplot_3.png differ
diff --git a/scilab/modules/helptools/images/Sfgrayplot_4.png b/scilab/modules/helptools/images/Sfgrayplot_4.png
deleted file mode 100644 (file)
index d51e090..0000000
Binary files a/scilab/modules/helptools/images/Sfgrayplot_4.png and /dev/null differ
index 075b68a..096d5c9 100644 (file)
Binary files a/scilab/modules/helptools/images/Sgrayplot_1.png and b/scilab/modules/helptools/images/Sgrayplot_1.png differ
index 079e7d7..b8ee4d3 100644 (file)
Binary files a/scilab/modules/helptools/images/_LaTeX_grand.xml_1.png and b/scilab/modules/helptools/images/_LaTeX_grand.xml_1.png differ
index 90d5e85..0750fad 100644 (file)
Binary files a/scilab/modules/helptools/images/_LaTeX_number_properties.xml_5.png and b/scilab/modules/helptools/images/_LaTeX_number_properties.xml_5.png differ
index b890691..58a02c2 100644 (file)
Binary files a/scilab/modules/helptools/images/_LaTeX_number_properties.xml_6.png and b/scilab/modules/helptools/images/_LaTeX_number_properties.xml_6.png differ
diff --git a/scilab/modules/helptools/images/_LaTeX_number_properties.xml_8.png b/scilab/modules/helptools/images/_LaTeX_number_properties.xml_8.png
deleted file mode 100644 (file)
index 58a02c2..0000000
Binary files a/scilab/modules/helptools/images/_LaTeX_number_properties.xml_8.png and /dev/null differ
diff --git a/scilab/modules/helptools/images/_LaTeX_number_properties.xml_9.png b/scilab/modules/helptools/images/_LaTeX_number_properties.xml_9.png
deleted file mode 100644 (file)
index 0750fad..0000000
Binary files a/scilab/modules/helptools/images/_LaTeX_number_properties.xml_9.png and /dev/null differ
index 7f12ab3..9b11bd2 100644 (file)
Binary files a/scilab/modules/helptools/images/champ1_1.png and b/scilab/modules/helptools/images/champ1_1.png differ
index d6f404a..1f0f781 100644 (file)
Binary files a/scilab/modules/helptools/images/cheb2mag_1.png and b/scilab/modules/helptools/images/cheb2mag_1.png differ
index 9141fcb..32bef1c 100644 (file)
Binary files a/scilab/modules/helptools/images/contour2d_2.png and b/scilab/modules/helptools/images/contour2d_2.png differ
index 755c9d3..cf80274 100644 (file)
Binary files a/scilab/modules/helptools/images/contourf_1.png and b/scilab/modules/helptools/images/contourf_1.png differ
index 6d433b4..9af2f66 100644 (file)
Binary files a/scilab/modules/helptools/images/grayplot_1.png and b/scilab/modules/helptools/images/grayplot_1.png differ
index 1d919d5..c76ba58 100644 (file)
Binary files a/scilab/modules/helptools/images/histplot_1.png and b/scilab/modules/helptools/images/histplot_1.png differ
index bf5f1b2..d9f3244 100644 (file)
Binary files a/scilab/modules/helptools/images/mesh_1.png and b/scilab/modules/helptools/images/mesh_1.png differ
index 9c4a4ed..004345e 100644 (file)
Binary files a/scilab/modules/helptools/images/plot_7.png and b/scilab/modules/helptools/images/plot_7.png differ
index ab960cb..8c1b429 100644 (file)
Binary files a/scilab/modules/helptools/images/xstringb_1.png and b/scilab/modules/helptools/images/xstringb_1.png differ
index 2b9edcd..70c82df 100644 (file)
Binary files a/scilab/modules/helptools/images/xstringl_1.png and b/scilab/modules/helptools/images/xstringl_1.png differ
index 5806fc5..0050b69 100644 (file)
@@ -299,7 +299,7 @@ public class DocbookTagConverter extends DefaultHandler {
                 exceptionOccured(new SAXException("uri " + uri + " not handled"));
                 return;
             }
-            StringBuilder buf = h.startExternalXML(localName, attributes);
+            StringBuilder buf = h.startExternalXML(localName, attributes, locator);
             if (buf != null) {
                 DocbookElement elem = baseElement.getNewInstance(localName, uri, null);
                 elem.setStringBuilder(buf);
index bc0533d..1cf1c2b 100644 (file)
@@ -1173,7 +1173,7 @@ public class HTMLDocbookTagConverter extends DocbookTagConverter implements Temp
         if (fs == null) {
             attributes.put("fontsize", "16");
         }
-        return ImageConverter.getImageByCode(currentFileName, contents, attributes, "image/latex", f, imageDir + "/" + f.getName(), getBaseImagePath());
+        return ImageConverter.getImageByCode(currentFileName, contents, attributes, "image/latex", f, imageDir + "/" + f.getName(), getBaseImagePath(), locator.getLineNumber(), language, isLocalized);
     }
 
     /**
index 8e7f5d0..2ee45c8 100644 (file)
@@ -13,6 +13,7 @@
 package org.scilab.modules.helptools.external;
 
 import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
 
 import org.scilab.modules.helptools.DocbookTagConverter;
 
@@ -20,7 +21,7 @@ public abstract class ExternalXMLHandler {
 
     private DocbookTagConverter converter;
 
-    public abstract StringBuilder startExternalXML(String localName, Attributes attributes);
+    public abstract StringBuilder startExternalXML(String localName, Attributes attributes, Locator locator);
 
     public abstract String endExternalXML(String localName);
 
index cc0297d..2557013 100644 (file)
@@ -17,6 +17,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
 
 import org.scilab.modules.helptools.HTMLDocbookTagConverter;
 import org.scilab.modules.helptools.image.ImageConverter;
@@ -37,6 +38,7 @@ public class HTMLMathMLHandler extends ExternalXMLHandler {
     private String baseDir;
     private String outputDir;
     private boolean isLocalized;
+    private int line;
 
     /**
      * Constructor
@@ -77,10 +79,11 @@ public class HTMLMathMLHandler extends ExternalXMLHandler {
     /**
      * {@inheritDoc}
      */
-    public StringBuilder startExternalXML(String localName, Attributes attributes) {
+    public StringBuilder startExternalXML(String localName, Attributes attributes, Locator locator) {
         if (MATH.equals(localName)) {
             String v = attributes.getValue(getScilabURI(), "localized");
             isLocalized = "true".equalsIgnoreCase(v);
+            line = locator.getLineNumber();
         }
 
         recreateTag(buffer, localName, attributes);
@@ -103,9 +106,9 @@ public class HTMLMathMLHandler extends ExternalXMLHandler {
                 f = new File(outputDir, BASENAME + getConverter().getCurrentBaseName() + "_" + language + "_" + (compt++) + ".png");
             } else {
                 if ("ru_RU".equals(language) && HTMLDocbookTagConverter.containsCyrillic(buffer)) {
-                    System.err.println("Warning: MathML code in " + getConverter().getCurrentFileName() + " contains cyrillic character. The tag <math> should contain the attribute scilab:localized=\"true\"");
+                    System.err.println("Warning: MathML code in " + getConverter().getCurrentFileName() + " at line " + line + " contains cyrillic character. The tag <math> should contain the attribute scilab:localized=\"true\"");
                 } else if ("ja_JP".equals(language) && HTMLDocbookTagConverter.containsCJK(buffer)) {
-                    System.err.println("Warning: MathML code in " + getConverter().getCurrentFileName() + " contains CJK character. The tag <math> should contain the attribute scilab:localized=\"true\"");
+                    System.err.println("Warning: MathML code in " + getConverter().getCurrentFileName() + " at line " + line + " contains CJK character. The tag <math> should contain the attribute scilab:localized=\"true\"");
                 }
                 f = new File(outputDir, BASENAME + getConverter().getCurrentBaseName() + "_" + (compt++) + ".png");
             }
@@ -117,7 +120,7 @@ public class HTMLMathMLHandler extends ExternalXMLHandler {
                 baseImagePath = ((HTMLDocbookTagConverter) getConverter()).getBaseImagePath();
             }
 
-            String ret = ImageConverter.getImageByCode(getConverter().getCurrentFileName(), buffer.toString(), attributes, "image/mathml", f, baseDir + f.getName(), baseImagePath);
+            String ret = ImageConverter.getImageByCode(getConverter().getCurrentFileName(), buffer.toString(), attributes, "image/mathml", f, baseDir + f.getName(), baseImagePath, line, language, isLocalized);
             buffer.setLength(0);
 
             return ret;
index 770b013..373534d 100644 (file)
@@ -17,6 +17,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
 
 import org.scilab.modules.helptools.HTMLDocbookTagConverter;
 import org.scilab.modules.helptools.image.ImageConverter;
@@ -37,6 +38,7 @@ public class HTMLSVGHandler extends ExternalXMLHandler {
     private String baseDir;
     private String outputDir;
     private boolean isLocalized;
+    private int line;
 
     /**
      * Constructor
@@ -76,10 +78,11 @@ public class HTMLSVGHandler extends ExternalXMLHandler {
     /**
      * {@inheritDoc}
      */
-    public StringBuilder startExternalXML(String localName, Attributes attributes) {
+    public StringBuilder startExternalXML(String localName, Attributes attributes, Locator locator) {
         if (SVG.equals(localName)) {
             String v = attributes.getValue(getScilabURI(), "localized");
             isLocalized = "true".equalsIgnoreCase(v);
+            line = locator.getLineNumber();
         }
 
         recreateTag(buffer, localName, attributes);
@@ -102,9 +105,9 @@ public class HTMLSVGHandler extends ExternalXMLHandler {
                 f = new File(outputDir, BASENAME + getConverter().getCurrentBaseName() + "_" + language + "_" + (compt++) + ".png");
             } else {
                 if ("ru_RU".equals(language) && HTMLDocbookTagConverter.containsCyrillic(buffer)) {
-                    System.err.println("Warning: SVG code in " + getConverter().getCurrentFileName() + " contains cyrillic character. The tag <svg> should contain the attribute scilab:localized=\"true\"");
+                    System.err.println("Warning: SVG code in " + getConverter().getCurrentFileName() + " at line " + line + " contains cyrillic character. The tag <svg> should contain the attribute scilab:localized=\"true\"");
                 } else if ("ja_JP".equals(language) && HTMLDocbookTagConverter.containsCJK(buffer)) {
-                    System.err.println("Warning: SVG code in " + getConverter().getCurrentFileName() + " contains CJK character. The tag <svg> should contain the attribute scilab:localized=\"true\"");
+                    System.err.println("Warning: SVG code in " + getConverter().getCurrentFileName() + " at line " + line + " contains CJK character. The tag <svg> should contain the attribute scilab:localized=\"true\"");
                 }
                 f = new File(outputDir, BASENAME + getConverter().getCurrentBaseName() + "_" + (compt++) + ".png");
             }
@@ -115,7 +118,7 @@ public class HTMLSVGHandler extends ExternalXMLHandler {
                 baseImagePath = ((HTMLDocbookTagConverter) getConverter()).getBaseImagePath();
             }
 
-            String ret = ImageConverter.getImageByCode(getConverter().getCurrentFileName(), buffer.toString(), attributes, "image/svg", f, baseDir + f.getName(), baseImagePath);
+            String ret = ImageConverter.getImageByCode(getConverter().getCurrentFileName(), buffer.toString(), attributes, "image/svg", f, baseDir + f.getName(), baseImagePath, line, language, isLocalized);
             buffer.setLength(0);
 
             return ret;
index 7c6f007..dbcf038 100644 (file)
@@ -19,6 +19,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
 
 import org.scilab.modules.helptools.HTMLDocbookTagConverter;
 import org.scilab.modules.helptools.image.ImageConverter;
@@ -40,6 +41,7 @@ public class HTMLScilabHandler extends ExternalXMLHandler {
     private String baseDir;
     private String outputDir;
     private boolean isLocalized;
+    private int line;
 
     /**
      * Constructor
@@ -80,10 +82,11 @@ public class HTMLScilabHandler extends ExternalXMLHandler {
     /**
      * {@inheritDoc}
      */
-    public StringBuilder startExternalXML(String localName, Attributes attributes) {
+    public StringBuilder startExternalXML(String localName, Attributes attributes, Locator locator) {
         if (localName.equals("image")) {
             String v = attributes.getValue("localized");
             isLocalized = "true".equalsIgnoreCase(v);
+            line = locator.getLineNumber();
         }
 
         if (IMAGE.equals(localName)) {
@@ -106,9 +109,10 @@ public class HTMLScilabHandler extends ExternalXMLHandler {
             if (dotpos != -1) {
                 baseName = baseName.substring(0, dotpos);
             }
+            String language = ((HTMLDocbookTagConverter) getConverter()).getLanguage();
             String fileName;
             if (isLocalized) {
-                fileName = baseName + BASENAME + ((HTMLDocbookTagConverter) getConverter()).getLanguage() + BASENAME + (compt++) + ".png";
+                fileName = baseName + BASENAME + language + BASENAME + (compt++) + ".png";
             } else {
                 fileName = baseName + BASENAME + (compt++) + ".png";
             }
@@ -123,7 +127,7 @@ public class HTMLScilabHandler extends ExternalXMLHandler {
                 baseImagePath = ((HTMLDocbookTagConverter) getConverter()).getBaseImagePath();
             }
             if (isLocalized || (existing = getExistingFile(outputDir, fileName)) == null) {
-                ret = ImageConverter.getImageByCode(currentFileName, buffer.toString(), attributes, "image/scilab", f, baseDir + f.getName(), baseImagePath);
+                ret = ImageConverter.getImageByCode(currentFileName, buffer.toString(), attributes, "image/scilab", f, baseDir + f.getName(), baseImagePath, line, language, isLocalized);
             } else {
                 ret = ImageConverter.getImageByFile(attributes, null, existing.getAbsolutePath(), outputDir, ".", baseImagePath);
                 ret = ScilabImageConverter.getInstance().getHTMLCodeToReturn(buffer.toString(), ret);
@@ -143,10 +147,10 @@ public class HTMLScilabHandler extends ExternalXMLHandler {
         try {
             final File outDir = new File(outputDir).getCanonicalFile();
             FileFilter filter = new FileFilter() {
-                    public boolean accept(File f) {
-                        return f.isDirectory() && !f.equals(outDir);
-                    }
-                };
+                public boolean accept(File f) {
+                    return f.isDirectory() && !f.equals(outDir);
+                }
+            };
             File[] dirs = outDir.getParentFile().listFiles(filter);
             File im = new File(filename);
             for (File dir : dirs) {
index 62e30e1..2214599 100644 (file)
@@ -220,7 +220,7 @@ public final class ImageConverter {
      * @param imageFile the filename
      * @return the HTML code to insert the image
      */
-    public static String getImageByCode(String currentFile, String code, Map<String, String> attrs, String mime, File imageFile, String imageName, String baseImagePath) {
+    public static String getImageByCode(String currentFile, String code, Map<String, String> attrs, String mime, File imageFile, String imageName, String baseImagePath, int lineNumber, String language, boolean isLocalized) {
         File current = null;
         try {
             current = new File(new URI(currentFile));
@@ -228,13 +228,21 @@ public final class ImageConverter {
 
         ExternalImageConverter conv = externalConverters.get(mime);
         if (conv == null) {
-            System.err.println("In file " + currentFile + "invalid code:\n" + code);
+            System.err.println("In file " + currentFile + " at line " + lineNumber + ": invalid code:\n" + code);
             return null;
         }
 
-        // if (conv.mustRegenerate() || current == null || current.lastModified() > imageFile.lastModified()) {
+        if (!imageFile.exists() && md5s != null) {
+            md5s.remove(imageFile.getName());
+        }
+
         if (!compareMD5(code, imageFile.getName())) {
-            System.err.println("Info: Create image " + imageFile.getName());
+            if (isLocalized || language.equals("en_US")) {
+                System.err.println("Info: Create image " + imageFile.getName() + " from line " + lineNumber + " in " + current.getName());
+            } else if (!language.equals("en_US")) {
+                System.err.println("Warning: Overwrite image " + imageFile.getName() + " from line " + lineNumber + " in " + current.getName() + ". Check the code or use scilab:localized=\"true\" attribute.");
+            }
+
             return conv.convertToImage(currentFile, code, attrs, imageFile, imageName);
         }
 
index 6c5a8e6..78319d9 100644 (file)
@@ -129,9 +129,10 @@ public class ScilabImageConverter implements ExternalImageConverter {
     private final String convertToPNG(String currentFile, String code, File imageFile, String imageName) {
         buffer.append("function _generate_image_from_doc\n");
         buffer.append("__olddrv__=driver();\n");
-        buffer.append("disp(\"Generate image " + imageName + " from Scilab code from file " + new File(currentFile).getName() + "\");\n");
+        buffer.append("disp(\"Generate image " + imageName + " from Scilab code from file " + new File(currentFile).getName() + "\");");
         buffer.append("driver(\"png\");\n");
         buffer.append("xinit(\"").append(imageFile.getAbsolutePath()).append("\");\n");
+        buffer.append("clf();\n");
         buffer.append(code).append("\n");
         buffer.append("___f___=gcf();___f___.anti_aliasing=\"2x\";clear(\"___f___\");\n");
         buffer.append("xend();\n");
index ddb6a27..cae5adf 100644 (file)
 n=10;
 omegar=6;
 A=1/0.2;
-samples=0.0001:0.05:10;
-h2=cheb2mag(n,omegar,A,samples);
-plot(samples,log(h2)/log(10),'frequencies','magnitude in dB')
+Samples=0.0001:0.05:10;
+h2=cheb2mag(n,omegar,A,Samples);
+plot(Samples,log(h2)/log(10))
+xtitle("", "frequencies", "magnitude in dB");
 
 //Plotting of frequency edges
 minval=(-max(-log(h2)))/log(10);
@@ -70,18 +71,19 @@ plot2d([omegar;omegar],[minval;0],[2],"000");
 
 //Computation of the attenuation in dB at the stopband edge
 attenuation=-log(A*A)/log(10);
-plot2d(samples',attenuation*ones(samples)',[5],"000")
+plot2d(Samples',attenuation*ones(Samples)',[5],"000")
  ]]></programlisting>
         <scilab:image><![CDATA[
-n=10;omegar=6;A=1/0.2;samples=0.0001:0.05:10;
-h2=cheb2mag(n,omegar,A,samples);
-plot(samples,log(h2)/log(10),'frequencies','magnitude in dB')
+n=10;omegar=6;A=1/0.2;Samples=0.0001:0.05:10;
+h2=cheb2mag(n,omegar,A,Samples);
+plot(Samples,log(h2)/log(10))
+xtitle("", "frequencies", "magnitude in dB");
 
 minval=(-max(-log(h2)))/log(10);
 plot2d([omegar;omegar],[minval;0],[2],"000");
 
 attenuation=-log(A*A)/log(10);
-plot2d(samples',attenuation*ones(samples)',[5],"000")
+plot2d(Samples',attenuation*ones(Samples)',[5],"000")
 ]]>     </scilab:image>
     </refsection>
     <refsection role="see also">
index ed0c969..09daa72 100644 (file)
         <title>例</title>
         <programlisting role="example"><![CDATA[ 
 //チェビシェフ; 阻止域のリップル
-n=10;omegar=6;A=1/0.2;sample=0.0001:0.05:10;
-h2=cheb2mag(n,omegar,A,sample);
-plot(sample,log(h2)/log(10),'frequencies','magnitude in dB')
+n=10;omegar=6;A=1/0.2;Samples=0.0001:0.05:10;
+h2=cheb2mag(n,omegar,A,Samples);
+plot(Samples,log(h2)/log(10))
+xtitle("", "frequencies", "magnitude in dB");
 
 //周波数のエッジをプロット
 minval=(-max(-log(h2)))/log(10);
@@ -67,8 +68,20 @@ plot2d([omegar;omegar],[minval;0],[2],"000");
 
 //阻止域のエッジにおける減衰(単位:dB)を計算
 attenuation=-log(A*A)/log(10);
-plot2d(sample',attenuation*ones(sample)',[5],"000")
+plot2d(Samples',attenuation*ones(Samples)',[5],"000")
  ]]></programlisting>
+        <scilab:image><![CDATA[
+n=10;omegar=6;A=1/0.2;Samples=0.0001:0.05:10;
+h2=cheb2mag(n,omegar,A,Samples);
+plot(Samples,log(h2)/log(10))
+xtitle("", "frequencies", "magnitude in dB");
+
+minval=(-max(-log(h2)))/log(10);
+plot2d([omegar;omegar],[minval;0],[2],"000");
+
+attenuation=-log(A*A)/log(10);
+plot2d(Samples',attenuation*ones(Samples)',[5],"000")
+]]>     </scilab:image>
     </refsection>
     <refsection role="see also">
         <title>参照</title>