From: Stanislav KROTER <krotersv@gmail.com>
Date: Sun, 1 Dec 2013 11:14:23 +0000 (+0600)
Subject: Revision of help page for macro
X-Git-Tag: 5.5.0~974
X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=2df3e198fc2be45b9fde8772ca3ae8b8677a0d07

Revision of help page for macro

Added russian translation of this help page.

Change-Id: I10fbed7fdb801bf0c22a30096aa264a6f2c58131
---

diff --git a/scilab/modules/functions/help/en_US/macro.xml b/scilab/modules/functions/help/en_US/macro.xml
index 7feb6a6..9ea2564 100644
--- a/scilab/modules/functions/help/en_US/macro.xml
+++ b/scilab/modules/functions/help/en_US/macro.xml
@@ -19,15 +19,15 @@
         <title>Description</title>
         <para>
             Macros are Scilab procedures ("macro", "function" and "procedure"
-            have the save meaning). Usually, they are defined 
-            in files with an editor and loaded into Scilab by <literal>exec</literal> or through
+            have the save meaning). Usually, they are defined
+            in files with an editor and loaded into Scilab by <function>exec</function> or through
             a library.
         </para>
         <para>
-            They can also be defined on-line (see <literal>deff</literal>). 
+            They can also be defined on-line (see <link linkend="deff">deff</link>).
             A file which contains a macro must begin as follows:
         </para>
-        <programlisting><![CDATA[ 
+        <programlisting role='no-scilab-exec'><![CDATA[
 function [y1,...,yn]=foo(x1,...,xm)
  ]]></programlisting>
         <para>
@@ -37,10 +37,10 @@ function [y1,...,yn]=foo(x1,...,xm)
             A macro can be compiled for faster execution. Collections
             of macros can be collected in libraries.
             Macros which begin with <literal>%</literal> sign (e.g. <literal>%foo</literal>) and whose
-            arguments are lists are used to perform specific 
-            operations: for example, <literal>z=%rmr(x,y)</literal> is equivalent
-            to <literal>z=x*y</literal> when <literal>x</literal> and <literal>z</literal> are rationals 
-            (i.e. <literal>x=list('r',n,d,[])</literal> with <literal>n</literal> and <literal>d</literal> polynomials).
+            arguments are lists are used to perform specific
+            operations: for example, <code>z=%rmr(x,y)</code> is equivalent
+            to <code>z=x*y</code> when <varname>x</varname> and <varname>z</varname> are rationals
+            (i.e. <code>x=list('r',n,d,[])</code> with <varname>n</varname> and <varname>d</varname> polynomials).
         </para>
     </refsection>
     <refsection role="see also">
diff --git a/scilab/modules/functions/help/ja_JP/macro.xml b/scilab/modules/functions/help/ja_JP/macro.xml
index 7ea4874..fa4e713 100644
--- a/scilab/modules/functions/help/ja_JP/macro.xml
+++ b/scilab/modules/functions/help/ja_JP/macro.xml
@@ -21,14 +21,14 @@
             マクロはScilabプロシージャ("macro", "function" および "procedure"
             は同じ意味です)です.
             通常,これらはエディタによりファイルの中で定義さえ,
-            <literal>exec</literal>によりまたは
+            <function>exec</function>によりまたは
             ライブラリによりScilabにロードされます.
         </para>
         <para>
-            マクロをオンラインで定義することも可能です(<literal>deff</literal>参照).
+            マクロをオンラインで定義することも可能です(<link linkend="deff">deff</link>参照).
             マクロを含むファイルは以下のように開始する必要があります:
         </para>
-        <programlisting><![CDATA[ 
+        <programlisting role='no-scilab-exec'><![CDATA[
 function [y1,...,yn]=foo(x1,...,xm)
  ]]></programlisting>
         <para>
@@ -40,11 +40,11 @@ function [y1,...,yn]=foo(x1,...,xm)
             <literal>%</literal>記号で始まり(例: <literal>%foo</literal>),
             その引数がリストであるマクロは,
             特定の処理を実行する際に使用されます:
-            例えば, <literal>z=%rmr(x,y)</literal> は
-            <literal>x</literal> および <literal>z</literal>が
-            有理数の場合に<literal>z=x*y</literal>と等価です.
-            (すなわち, 多項式<literal>n</literal> および
-            <literal>d</literal> を指定した <literal>x=list('r',n,d,[])</literal>)
+            例えば, <code>z=%rmr(x,y)</code> は
+            <varname>x</varname> および <varname>z</varname>が
+            有理数の場合に<code>z=x*y</code>と等価です.
+            (すなわち, 多項式<varname>n</varname> および
+            <varname>d</varname> を指定した <code>x=list('r',n,d,[])</code>)
         </para>
     </refsection>
     <refsection role="see also">
diff --git a/scilab/modules/functions/help/pt_BR/macro.xml b/scilab/modules/functions/help/pt_BR/macro.xml
index 62722af..fb5f1cf 100644
--- a/scilab/modules/functions/help/pt_BR/macro.xml
+++ b/scilab/modules/functions/help/pt_BR/macro.xml
@@ -10,7 +10,7 @@
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="macro" 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="macro" xml:lang="pt">
     <refnamediv>
         <refname>macro</refname>
         <refpurpose>Procedimento Scilab e objeto Scilab</refpurpose>
@@ -19,14 +19,14 @@
         <title>Descrição</title>
         <para>Macros são procedimentos Scilab ("macro", "função" e "procedimento"
             possuem o mesmo significado). Geralmente, eles são definidos em arquivos
-            com um editor e carregados no Scilab com <literal>exec</literal> ou
+            com um editor e carregados no Scilab com <function>exec</function> ou
             através de uma biblioteca.
         </para>
         <para>
-            Também podem ser definidos on-line (ver <literal>deff</literal>). Um
+            Também podem ser definidos on-line (ver <link linkend="deff">deff</link>). Um
             arquivo que contém uma macro deve começar como segue:
         </para>
-        <programlisting role=""><![CDATA[ 
+        <programlisting role='no-scilab-exec'><![CDATA[
 function [y1,...,yn]=foo(x1,...,xm)
  ]]></programlisting>
         <para>
@@ -37,10 +37,10 @@ function [y1,...,yn]=foo(x1,...,xm)
             que começam pelo símbolo <literal>%</literal> (ex.:
             <literal>%foo</literal>) e cujos argumentos são listas são usadas para
             executar operações específicas: por exemplo,
-            <literal>z=%rmr(x,y)</literal> é equivalente a <literal>z=x*y</literal>
-            quando <literal>x</literal> e <literal>z</literal> são racionais (i.e.
-            <literal>x=list('r',n,d,[])</literal> com <literal>n</literal> e
-            <literal>d</literal> polinômios).
+            <code>z=%rmr(x,y)</code> é equivalente a <code>z=x*y</code>
+            quando <varname>x</varname> e <varname>z</varname> são racionais (i.e.
+            <code>x=list('r',n,d,[])</code> com <varname>n</varname> e
+            <varname>d</varname> polinômios).
         </para>
     </refsection>
     <refsection role="see also">
diff --git a/scilab/modules/functions/help/ru_RU/macro.xml b/scilab/modules/functions/help/ru_RU/macro.xml
new file mode 100644
index 0000000..cb37ad4
--- /dev/null
+++ b/scilab/modules/functions/help/ru_RU/macro.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) ????-2008 - INRIA
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
+ *
+ -->
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ru" xml:id="macro">
+    <refnamediv>
+        <refname>макрос</refname>
+        <refpurpose>Scilab-процедура и Scilab-объект</refpurpose>
+    </refnamediv>
+    <refsection>
+        <title>Описание</title>
+        <para>
+            Макросы - это Scilab-процедуры ("макрос", "функция" и
+            "процедура" имеют одно и то же значение). Обычно они
+            определяются в файле с помощью редактора и загружаются в
+            Scilab с помощью функции <function>exec</function> или через
+            библиотеку.
+        </para>
+        <para>
+            Они могут быть также определены в ходе выполнения программы
+            (см. <link linkend="deff">deff</link>). Файл, который содержит макрос, должен начинаться следующим образом:
+        </para>
+        <programlisting role='no-scilab-exec'><![CDATA[
+function [y1,...,yn]=foo(x1,...,xm)
+ ]]></programlisting>
+        <para>
+            <literal>yi</literal> - выходные переменные, вычисленные в зависимости от входных переменных и переменных, существующих в Scilab'е в момент исполнения макроса. Макрос может быть скомпилированным для более быстрого исполнения. Коллекции макросов могут быть собраны в библиотеки.are output variables calculated as functions of
+            input variables and variables existing in Scilab
+            when the macro is executed.
+            A macro can be compiled for faster execution. Collections
+            of macros can be collected in libraries.
+        </para>
+        <para>
+            Макросы, которые начинаются со знака <literal>%</literal> (например, <literal>%foo</literal>) и чьи аргументы являются списками, используются для выполнения особых операций: например, <code>z=%rmr(x,y)</code> эквивалентно
+            <code>z=x*y</code>, когда <varname>x</varname> и <varname>z</varname> являются рациональными переменными
+            (например, <code>x=list('r',n,d,[])</code>, где <varname>n</varname> и <varname>d</varname> - полиномы).
+        </para>
+    </refsection>
+    <refsection role="see also">
+        <title>Смотрите также</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="deff">deff</link>
+            </member>
+            <member>
+                <link linkend="exec">exec</link>
+            </member>
+            <member>
+                <link linkend="comp">comp</link>
+            </member>
+            <member>
+                <link linkend="lib">lib</link>
+            </member>
+        </simplelist>
+    </refsection>
+</refentry>