bitstring() complement 09/21009/4
Samuel GOUGEON [Sat, 15 Jun 2019 19:10:11 +0000 (21:10 +0200)]
  + fix CHANGES 12534 trimed by https://codereview.scilab.org/20621

Change-Id: Ifa0f8d787ddd15e7c98d77eede1973a52127f7bc

12 files changed:
scilab/CHANGES.md
scilab/modules/elementary_functions/help/en_US/bitwise/bitget.xml
scilab/modules/elementary_functions/help/en_US/integer_representation/bin2dec.xml
scilab/modules/elementary_functions/help/en_US/integer_representation/dec2bin.xml
scilab/modules/elementary_functions/help/ja_JP/integer_representation/bin2dec.xml
scilab/modules/elementary_functions/help/ja_JP/integer_representation/dec2bin.xml
scilab/modules/elementary_functions/help/pt_BR/integer_representation/bin2dec.xml
scilab/modules/elementary_functions/help/pt_BR/integer_representation/dec2bin.xml
scilab/modules/elementary_functions/help/ru_RU/bitwise/bitget.xml
scilab/modules/elementary_functions/help/ru_RU/integer_representation/bin2dec.xml
scilab/modules/elementary_functions/help/ru_RU/integer_representation/dec2bin.xml
scilab/modules/helptools/data/configuration/scilab_primitives.txt

index c87346b..5c7d1df 100644 (file)
@@ -95,6 +95,7 @@ Feature changes and additions
   - For decimal numbers: bits with indices > 52 can now be retrieved (up to `log2(number_properties("huge"))` = 1024).
   - For decimal numbers `x > 2^52`, querried bits below `%eps` (indices < log2(x)-52) now return `Nan` instead of 0.
   - Several bits can now be retrieved from each component of an input array.
+* `bitstring` function added.
 * `edit` now accepts a line number as text (like "23").
 * `profileEnable`, `profileDisable`, `profileGetInfo` could be used to instrument functions and gather execution information within Scilab.
 * `prettyprint()` is upgraded:
@@ -116,7 +117,6 @@ Feature changes and additions
   - When there is no solution, [] is returned.
   - When there is an infinite number of solutions, the err flag has a specific value.
   - The output size gets the input's one.
-<<<<<<< HEAD
 * `csvRead` and `csvTextScan` are now implemented without extra copies.
 * `editvar()` GUI support copy-paste of strings removing quotes.
 * calendar() can now display formated calendars.
@@ -130,13 +130,11 @@ Feature changes and additions
   - `riccati(H)` and `riccati(H,E)` syntaxes added, to describe the Riccati equation through its Hamiltonian H or (E,H) pencil.
   - The residual is returned as new 3rd output argument.
   - When no solution is found, `X=[]` | `X1=[]` is returned instead of yielding an error.
-=======
 * `hallchart()` is upgraded:
   - The default set of modules is set automatically, according to data bounds.
   - Handles of the grids and labels are returned. Post-processing them become easy.
   - Named colors accepted ; better default colors.
   - Improved placement of labels.
->>>>>>> 839d040c90b... * Bug 16292 fixed: hallchart() debugged & improved
 
 
 Help pages:
@@ -177,11 +175,8 @@ Obsolete functions or features
 Removed Functions
 -----------------
 
-<<<<<<< HEAD
 * `getPreferencesValue` was obsolete and has been removed. Please use `xmlGetValues` instead.
-=======
 * `eval` was obsolete and has been removed. Please use `evstr` instead.
->>>>>>> 1ec71c6c514... * Bug 15309 fixed: eval() actual removal
 * `hypermat` was obsolete and has been removed. Please use `matrix` instead.
 * `square` was obsolete and has been removed.
 * `xgetech` was obsolete and has been removed. Please use `gca` instead.
index d62a102..ea2aa72 100644 (file)
@@ -217,13 +217,16 @@ bitget(x, [5 8 12 39])
         <title>See Also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="bitset">bitset</link>
+                <link linkend="bitstring">bitstring</link>
             </member>
             <member>
-                <link linkend="bitand">bitand</link>
+                <link linkend="dec2bin">dec2bin</link>
             </member>
             <member>
-                <link linkend="dec2bin">dec2bin</link>
+                <link linkend="bitset">bitset</link>
+            </member>
+            <member>
+                <link linkend="bitand">bitand</link>
             </member>
             <member>
                 <link linkend="and_op">&amp;</link>
index bca12f6..1f9b377 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="bin2dec" 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="bin2dec" xml:lang="en">
     <refnamediv>
         <refname>bin2dec</refname>
         <refpurpose>convert from binary to decimal</refpurpose>
@@ -82,10 +85,7 @@ y=bin2dec(str)
                 <link linkend="dec2bin">dec2bin</link>
             </member>
             <member>
-                <link linkend="dec2oct">dec2oct</link>
-            </member>
-            <member>
-                <link linkend="dec2hex">dec2hex</link>
+                <link linkend="bitstring">bitstring</link>
             </member>
         </simplelist>
     </refsection>
index d359cde..876ce57 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="dec2bin" 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="dec2bin" xml:lang="en">
     <refnamediv>
         <refname>dec2bin</refname>
         <refpurpose>convert from decimal to binary</refpurpose>
@@ -22,8 +25,8 @@
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
-            str=dec2bin(x)
-            str=dec2bin(x,n)
+            str = dec2bin(x)
+            str = dec2bin(x,n)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
@@ -91,16 +94,10 @@ z=dec2bin(x)
         <title>See also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="base2dec">base2dec</link>
+                <link linkend="bitstring">bitstring</link>
             </member>
             <member>
-                <link linkend="bin2dec">bin2dec</link>
-            </member>
-            <member>
-                <link linkend="oct2dec">oct2dec</link>
-            </member>
-            <member>
-                <link linkend="hex2dec">hex2dec</link>
+                <link linkend="dec2base">dec2base</link>
             </member>
             <member>
                 <link linkend="dec2oct">dec2oct</link>
@@ -108,6 +105,9 @@ z=dec2bin(x)
             <member>
                 <link linkend="dec2hex">dec2hex</link>
             </member>
+            <member>
+                <link linkend="bin2dec">bin2dec</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index c61881f..c13ba0b 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="bin2dec" 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="bin2dec" xml:lang="ja">
     <refnamediv>
-
         <refname>bin2dec</refname>
-
         <refpurpose>2進表現を整数に変換</refpurpose>
-
     </refnamediv>
-
     <refsynopsisdiv>
-
         <title>呼び出し手順</title>
-
         <synopsis>y=bin2dec(str)</synopsis>
-
     </refsynopsisdiv>
-
     <refsection>
-
         <title>引数</title>
-
         <variablelist>
-
             <varlistentry>
-
                 <term>str</term>
-
                 <listitem>
-
                     <para>
-
                         文字 '1' および '0'のみを含む文字列の行列
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>y</term>
-
                 <listitem>
-
                     <para>double行列,正の整数値</para>
-
                 </listitem>
-
             </varlistentry>
-
         </variablelist>
-
     </refsection>
-
     <refsection>
-
         <title>説明</title>
-
         <para>
-
             2進文字列<literal>str</literal> を指定すると, この関数は,
-
             その2進表現が<literal>str</literal>となるような
-
             10進数 <literal>y</literal> を返します.
-
             ( <literal>y</literal> と
-
             <literal>str</literal> の大きさは同じになります).
-
         </para>
-
     </refsection>
-
     <refsection>
-
         <title>例</title>
-
         <programlisting role="example"><![CDATA[
 // example 1 :
 // '1010110' : is the binary representation of 86
 str='1010110';
 y=bin2dec(str)
+
 // example 2 :
 // '1011011' : is the binary representation of 91
 // '1010010' : is the binary representation of 82
 str=['1011011'; '1010010']
 y=bin2dec(str)
  ]]></programlisting>
-
     </refsection>
-
     <refsection role="see also">
-
         <title>参照</title>
-
         <simplelist type="inline">
-
             <member>
-
                 <link linkend="base2dec">base2dec</link>
-
             </member>
-
             <member>
-
                 <link linkend="oct2dec">oct2dec</link>
-
             </member>
-
             <member>
-
                 <link linkend="hex2dec">hex2dec</link>
-
             </member>
-
             <member>
-
                 <link linkend="dec2bin">dec2bin</link>
-
             </member>
-
             <member>
-
-                <link linkend="dec2oct">dec2oct</link>
-
+                <link linkend="bitstring">bitstring</link>
             </member>
-
-            <member>
-
-                <link linkend="dec2hex">dec2hex</link>
-
-            </member>
-
         </simplelist>
-
     </refsection>
-
-</refentry>
-
+</refentry>
\ No newline at end of file
index d018f11..e9cf9a8 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="dec2bin" 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="dec2bin" xml:lang="ja">
     <refnamediv>
-
         <refname>dec2bin</refname>
-
         <refpurpose>10進数から2進数への変換</refpurpose>
-
     </refnamediv>
-
     <refsynopsisdiv>
-
         <title>呼び出し手順</title>
-
         <synopsis>
-
-            str=dec2bin(x)
-
-            str=dec2bin(x,n)
-
+            str = dec2bin(x)
+            str = dec2bin(x,n)
         </synopsis>
-
     </refsynopsisdiv>
-
     <refsection>
-
         <title>引数</title>
-
         <variablelist>
-
             <varlistentry>
-
                 <term>x</term>
-
                 <listitem>
-
                     <para>double行列, 正の整数値</para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>n</term>
-
                 <listitem>
-
                     <para>正の整数</para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>str</term>
-
                 <listitem>
-
                     <para>文字列の行列</para>
-
                 </listitem>
-
             </varlistentry>
-
         </variablelist>
-
     </refsection>
-
     <refsection>
-
         <title>説明</title>
-
         <para>
-
             正の整数(または整数のベクトル/行列)
-
             <literal>x</literal>を指定すると,
-
             この関数は,
-
             <literal>x</literal>の2進数表現を含む
-
             文字列(または文字列の列ベクトル)を返します.
-
             <literal>x</literal>の次元が1より大きい場合,
-
             列ベクトル<literal>str</literal>の各要素が
-
             <literal>x</literal>の要素の2進表現となります
-
             (すなわち,<literal>str(i)</literal>が
-
             <literal>x(i)</literal>の2進表現).
-
         </para>
-
         <para>
-
             <literal>str</literal>の要素の長さが<literal>n</literal>
-
             より小さい場合 (すなわち, length str(i) &lt; n),
-
             <literal>str</literal>要素の左側に,長さが
-
             <literal>n.</literal>等しくなる分の文字 '0'を
-
             <literal>str</literal>要素の左側に追加します.
-
         </para>
-
     </refsection>
-
     <refsection>
-
         <title>例</title>
-
         <programlisting role="example"><![CDATA[
 // 例 1 :
 x=86;
 str=dec2bin(x)
+
 // 例 2 :
 // 86 の2進表現は : '1010110'
 // 長さは7 (n以下)のため, str(の左側)に'0'が8個追加されます
 x=86;n=15;
 str=dec2bin(x,n)
+
 // 例 3 :
 x=[12;45;135]
 z=dec2bin(x)
  ]]></programlisting>
-
     </refsection>
-
     <refsection role="see also">
-
         <title>参照</title>
-
         <simplelist type="inline">
-
-            <member>
-
-                <link linkend="base2dec">base2dec</link>
-
-            </member>
-
             <member>
-
-                <link linkend="bin2dec">bin2dec</link>
-
-            </member>
-
-            <member>
-
-                <link linkend="oct2dec">oct2dec</link>
-
+                <link linkend="bitstring">bitstring</link>
             </member>
-
             <member>
-
-                <link linkend="hex2dec">hex2dec</link>
-
+                <link linkend="dec2base">dec2base</link>
             </member>
-
             <member>
-
                 <link linkend="dec2oct">dec2oct</link>
-
             </member>
-
             <member>
-
                 <link linkend="dec2hex">dec2hex</link>
-
             </member>
-
+            <member>
+                <link linkend="bin2dec">bin2dec</link>
+            </member>
         </simplelist>
-
     </refsection>
-
-</refentry>
-
+</refentry>
\ No newline at end of file
index 1b05953..c8c0331 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:ns3="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="bin2dec" 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:ns3="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="bin2dec" xml:lang="pt">
     <refnamediv>
         <refname>bin2dec</refname>
         <refpurpose>conversão de representação binária para inteira</refpurpose>
@@ -81,10 +84,7 @@ y=bin2dec(str)
                 <link linkend="dec2bin">dec2bin</link>
             </member>
             <member>
-                <link linkend="dec2oct">dec2oct</link>
-            </member>
-            <member>
-                <link linkend="dec2hex">dec2hex</link>
+                <link linkend="bitstring">bitstring</link>
             </member>
         </simplelist>
     </refsection>
index 7797c8a..b274e43 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="dec2bin" xml:lang="pt">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="dec2bin" xml:lang="pt">
     <refnamediv>
         <refname>dec2bin</refname>
         <refpurpose>representação binária</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>[str]=dec2bin(x[,n])</synopsis>
+        <synopsis>
+            str = dec2bin(x)
+            str = dec2bin(x, n)
+        </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Parâmetros</title>
@@ -84,16 +90,10 @@ z=dec2bin(x)
         <title>Ver Também</title>
         <simplelist type="inline">
             <member>
-                <link linkend="base2dec">base2dec</link>
+                <link linkend="bitstring">bitstring</link>
             </member>
             <member>
-                <link linkend="bin2dec">bin2dec</link>
-            </member>
-            <member>
-                <link linkend="oct2dec">oct2dec</link>
-            </member>
-            <member>
-                <link linkend="hex2dec">hex2dec</link>
+                <link linkend="dec2base">dec2base</link>
             </member>
             <member>
                 <link linkend="dec2oct">dec2oct</link>
@@ -101,6 +101,9 @@ z=dec2bin(x)
             <member>
                 <link linkend="dec2hex">dec2hex</link>
             </member>
+            <member>
+                <link linkend="bin2dec">bin2dec</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>
index dfc081a..3a985fa 100644 (file)
@@ -216,13 +216,16 @@ bitget(x, [5 8 12 39])
         <title>Смотрите также</title>
         <simplelist type="inline">
             <member>
-                <link linkend="bitset">bitset</link>
+                <link linkend="bitstring">bitstring</link>
             </member>
             <member>
-                <link linkend="bitand">bitand</link>
+                <link linkend="dec2bin">dec2bin</link>
             </member>
             <member>
-                <link linkend="dec2bin">dec2bin</link>
+                <link linkend="bitset">bitset</link>
+            </member>
+            <member>
+                <link linkend="bitand">bitand</link>
             </member>
             <member>
                 <link linkend="and_op">&amp;</link>
index 704e7c0..2da9390 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="bin2dec" 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="bin2dec" xml:lang="ru">
     <refnamediv>
         <refname>bin2dec</refname>
         <refpurpose>преобразование из двоичной системы счисления в десятичную</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
-        <synopsis>y=bin2dec(str)</synopsis>
+        <synopsis>y = bin2dec(str)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Аргументы</title>
@@ -81,10 +84,7 @@ y=bin2dec(str)
                 <link linkend="dec2bin">dec2bin</link>
             </member>
             <member>
-                <link linkend="dec2oct">dec2oct</link>
-            </member>
-            <member>
-                <link linkend="dec2hex">dec2hex</link>
+                <link linkend="bitstring">bitstring</link>
             </member>
         </simplelist>
     </refsection>
index 629c306..1805fb4 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="dec2bin" 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="dec2bin" xml:lang="ru">
     <refnamediv>
         <refname>dec2bin</refname>
         <refpurpose>преобразование из десятичной системы счисления в двоичную</refpurpose>
@@ -22,8 +25,8 @@
     <refsynopsisdiv>
         <title>Синтаксис</title>
         <synopsis>
-            str=dec2bin(x)
-            str=dec2bin(x,n)
+            str = dec2bin(x)
+            str = dec2bin(x, n)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
@@ -93,16 +96,10 @@ z=dec2bin(x)
         <title>Смотрите также</title>
         <simplelist type="inline">
             <member>
-                <link linkend="base2dec">base2dec</link>
+                <link linkend="bitstring">bitstring</link>
             </member>
             <member>
-                <link linkend="bin2dec">bin2dec</link>
-            </member>
-            <member>
-                <link linkend="oct2dec">oct2dec</link>
-            </member>
-            <member>
-                <link linkend="hex2dec">hex2dec</link>
+                <link linkend="dec2base">dec2base</link>
             </member>
             <member>
                 <link linkend="dec2oct">dec2oct</link>
@@ -110,6 +107,9 @@ z=dec2bin(x)
             <member>
                 <link linkend="dec2hex">dec2hex</link>
             </member>
+            <member>
+                <link linkend="bin2dec">bin2dec</link>
+            </member>
         </simplelist>
     </refsection>
 </refentry>