[doc] console page overhauled 59/20659/6
Samuel GOUGEON [Sun, 16 Dec 2018 04:51:39 +0000 (05:51 +0100)]
  PDF: https://codereview.scilab.org/cat/20659%2C1%2Cscilab/modules/console/help/console.pdf%5E0

Change-Id: I41c30da8ff3627cb0c1a978f794c629d88d836e9

scilab/modules/console/help/en_US/console.xml
scilab/modules/console/help/images/completion_listbox.png [new file with mode: 0644]
scilab/modules/console/help/images/preferences_shortcuts.png [new file with mode: 0644]
scilab/modules/console/help/ja_JP/console.xml [deleted file]
scilab/modules/console/help/ru_RU/console.xml

index 600d10b..5198a09 100644 (file)
@@ -2,8 +2,8 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - DIGITEO - Allan CORNET
- *
  * 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.
  * 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" scilab:needs-examples="no" xml:id="console" 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: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="console" xml:lang="en">
+    <refnamediv xml:id="shortcuts"></refnamediv>
     <refnamediv>
         <refname>console</refname>
-        <refpurpose>Keyboard Shortcuts in the Console Window</refpurpose>
+        <refpurpose>Keyboard shortcuts predefined in the console window</refpurpose>
     </refnamediv>
     <refsection>
         <title>Description</title>
+        For the three <literal>STD</literal>, <literal>NW</literal> and <literal>NWNI</literal>
+        Scilab running modes, some keyboard shortcuts are available when the console has the focus.
+        The predefined default ones are listed in the following table. They can be redefined
+        through the Scilab <link linkend="preferences">preferences</link> (General/shortcuts).
+        <para/>
+        <warning>
+            <para>
+            A given key combination may have distinct actions according to the component having the
+            focus: The console, a graphic figure, the history browser, etc.
+            Herebelow, only shortcuts defined for the console's panel are considered.
+            </para>
+        </warning>
+        <para>
         <informaltable border="1">
             <tr>
-                <td>UP or Ctrl+P</td>
-                <td>recall previous line.</td>
-            </tr>
-            <tr>
-                <td>DOWN or Ctrl+N</td>
-                <td>recall next line.</td>
-            </tr>
-            <tr>
-                <td>F1</td>
-                <td>call help.</td>
+                <td><emphasis role="bold">Shortcut</emphasis></td>
+                <th>STD</th>
+                <th>NW</th>
+                <th>NWNI</th>
+                <td><emphasis role="bold">Action</emphasis></td>
             </tr>
+            <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
             <tr>
-                <td>F2</td>
-                <td>clear console.</td>
+                <td colspan="5"><refsect3><title>Main actions</title></refsect3></td>
             </tr>
             <tr>
-                <td>F12</td>
-                <td>open console box only on Windows.</td>
+                <td>ALT</td>
+                <td align="center">x</td>
+                <td align="center"></td>
+                <td align="center"></td>
+                <td>Sets / unsets the focus to the console menus. Then arrows or/and underlined
+                activation keys of menus items allow to browse the menus.
+                </td>
             </tr>
             <tr>
                 <td>Ctrl+space or TAB</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
                 <td>completion : Scilab displays a list of all names that start with
                     somes characters.
+                    <para/>
+                    <inlinemediaobject>
+                        <imageobject>
+                            <imagedata fileref="../images/completion_listbox.png" />
+                        </imageobject>
+                    </inlinemediaobject>
                 </td>
             </tr>
             <tr>
-                <td>Ctrl + A or HOME</td>
-                <td>move to beginning of current line.</td>
+                <td>F1</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td></td>
+                <td>opens the help browser or brings it to the foreground</td>
             </tr>
             <tr>
-                <td>Ctrl + B or LEFT</td>
-                <td>moves the cursor one character to the left.</td>
+                <td>F12</td>
+                <td align="center">x</td>
+                <td></td>
+                <td></td>
+                <td>opens the console box terminal (Windows only)</td>
+            </tr>
+            <tr>
+                <td>F3 or Ctrl + F</td>
+                <td align="center">x</td>
+                <td></td>
+                <td></td>
+                <td>Opens the search/Find dialog for the console's content</td>
             </tr>
             <tr>
                 <td>Ctrl + C</td>
-                <td>interrupts Scilab if nothing selected in the console, else text
-                    selected is sent to clipboard.
-                </td>
+                <td align="center">x</td>
+                <td></td>
+                <td></td>
+                <td>Copies the selection to the clipboard</td>
             </tr>
             <tr>
-                <td>Ctrl + D or DELETE</td>
-                <td>deletes the current character.</td>
+                <td>Ctrl + C</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>Interrupts a running execution</td>
             </tr>
             <tr>
-                <td>Ctrl + E or END</td>
-                <td>moves the cursor to the end of command line.</td>
+                <td>Ctrl + V</td>
+                <td align="center">x</td>
+                <td></td>
+                <td></td>
+                <td>Inserts the clipboard's content</td>
             </tr>
             <tr>
-                <td>Ctrl + F or RIGHT</td>
-                <td>moves the cursor one character to the right.</td>
+                <td>Ctrl + V</td>
+                <td></td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>Replaces the line's tail with the clipboard's content</td>
             </tr>
             <tr>
-                <td>Ctrl + H or BACKSPACE</td>
-                <td>deletes the previous character.</td>
+                <td>Ctrl + X</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>(Interrupts Scilab)</td>
             </tr>
+<!--
+                <td>Ctrl + F</td><td>Opens the search/Find dialog for the Console content</td>
+                <td>Ctrl + U</td><td>kills command line from cursor to beginning.</td>
+-->
+            <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
             <tr>
-                <td>Ctrl + K</td>
-                <td>kills command line from cursor to the end.</td>
+                <td colspan="5"><refsect3><title>History</title></refsect3></td>
             </tr>
             <tr>
-                <td>Ctrl + S</td>
-                <td>select all.</td>
+                <td>UP</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>recalls the previous command line</td>
             </tr>
             <tr>
-                <td>Ctrl + U</td>
-                <td>delete the whole command line.</td>
+                <td>Ctrl + P</td>
+                <td></td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>recalls the Previous command line</td>
             </tr>
             <tr>
-                <td>Ctrl + V</td>
-                <td>do a paste from clipboard.</td>
+                <td>DOWN</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>recalls the next command line</td>
             </tr>
             <tr>
-                <td>Ctrl + W</td>
-                <td>delete the last word of the command line.</td>
+                <td>Ctrl + N</td>
+                <td></td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>recalls the Next command line</td>
             </tr>
             <tr>
-                <td>Ctrl + X</td>
-                <td>Interrupt Scilab</td>
+                <td valign='top'>!abc&lt;enter></td>
+                <td align="center">x</td>
+                <td></td>
+                <td></td>
+                <td>
+                    recalls the last command line starting with 'abc' ('!' must be the very first
+                    character of the line)
+                </td>
             </tr>
+            <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
             <tr>
-                <td>Ctrl + LEFT</td>
-                <td>move left one word.</td>
+                <td colspan="5"><refsect3><title>Selection</title></refsect3></td>
             </tr>
             <tr>
-                <td>Ctrl + RIGHT</td>
-                <td>move right one word.</td>
+                <td>Ctrl + S</td>
+                <td align="center">x</td>
+                <td></td>
+                <td></td>
+                <td>Selects all the console's content</td>
             </tr>
             <tr>
                 <td>Shift + HOME</td>
-                <td>select from cursor to beginning of statement.</td>
+                <td align="center">x</td>
+                <td></td>
+                <td></td>
+                <td>selects from cursor to the line's head</td>
             </tr>
             <tr>
                 <td>Shift + END</td>
-                <td>select from cursor to end of statement.</td>
+                <td align="center">x</td>
+                <td></td>
+                <td></td>
+                <td>selects from cursor to the line's end</td>
             </tr>
             <tr>
                 <td>Double-click</td>
-                <td>select current word.</td>
+                <td align="center">x</td>
+                <td></td>
+                <td align="center">x</td>
+                <td>selects the current word</td>
             </tr>
-        </informaltable>
-    </refsection>
-    <refnamediv>
-        <refname>console cli</refname>
-        <refpurpose>Keyboard Shortcuts in NW/NWNI mode</refpurpose>
-    </refnamediv>
-    <refsection>
-        <title>Description</title>
-        <informaltable border="1">
+            <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
             <tr>
-                <td>UP or Ctrl+P</td>
-                <td>recall previous line.</td>
+                <td colspan="5"><refsect3><title>Deletion</title></refsect3></td>
             </tr>
             <tr>
-                <td>DOWN or Ctrl+N</td>
-                <td>recall next line.</td>
+                <td>F2</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>clears the console, like <link linkend="clc">clc</link></td>
             </tr>
             <tr>
-                <td>TAB</td>
-                <td>completion : Scilab displays a list of all names that start with
-                    somes characters.
-                </td>
+                <td>Ctrl + D or DELETE</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>Deletes the current character (or on the right)</td>
             </tr>
             <tr>
-                <td>Ctrl + A or HOME</td>
-                <td>move to beginning of current line.</td>
+                <td>Ctrl + H or BACKSPACE</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>deletes the previous character.</td>
             </tr>
             <tr>
-                <td>Ctrl + B or LEFT</td>
-                <td>moves the cursor one character to the left.</td>
+                <td>Ctrl + K</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>Kills the line's tail, from cursor to the end</td>
             </tr>
             <tr>
-                <td>Ctrl + D or DELETE</td>
-                <td>deletes the current character.</td>
+                <td>Ctrl + U</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>deletes the whole command line</td>
             </tr>
             <tr>
-                <td>Ctrl + E or END</td>
-                <td>moves the cursor to the end of command line.</td>
+                <td>Ctrl + W</td>
+                <td align="center">x</td>
+                <td></td>
+                <td></td>
+                <td>deletes the last space-separated Word of the line.</td>
             </tr>
             <tr>
-                <td>Ctrl + F or RIGHT</td>
-                <td>moves the cursor one character to the right.</td>
+                <td>Ctrl + W</td>
+                <td></td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>deletes the Word the cursor is on, and the line's tail</td>
             </tr>
+            <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
             <tr>
-                <td>Ctrl + H or BACKSPACE</td>
-                <td>deletes the previous character.</td>
+                <td colspan="5"><refsect3><title>Cursor movements</title></refsect3></td>
             </tr>
             <tr>
-                <td>Ctrl + K</td>
-                <td>kills command line from cursor to the end.</td>
+                <td>Ctrl + A or HOME</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>moves the cursor to the head of current line</td>
             </tr>
             <tr>
-                <td>Ctrl + U</td>
-                <td>kills command line from cursor to beginning.</td>
+                <td>Ctrl + B or LEFT</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>moves the cursor one character Backward, to the left</td>
             </tr>
             <tr>
-                <td>Ctrl + W</td>
-                <td>delete the previous word from the cursor.</td>
+                <td>Ctrl + LEFT</td>
+                <td></td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>moves the cursor to the beginning of the current or previous word</td>
             </tr>
+            <!--
             <tr>
-                <td>Alt+B or Ctrl+LEFT</td>
+                <td>Alt+B</td>
                 <td>move left one word.</td>
             </tr>
+            -->
+            <tr>
+                <td>Ctrl + E or END</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>moves the cursor to the End of command line</td>
+            </tr>
             <tr>
-                <td>Alt+F or Ctrl+RIGHT</td>
-                <td>move right one word.</td>
+                <td>Ctrl + F</td>
+                <td></td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>moves the cursor one character Forward, to the right</td>
+            </tr>
+            <tr>
+                <td>RIGHT</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>moves the cursor one character to the right</td>
+            </tr>
+            <tr>
+                <td>Ctrl + RIGHT</td> <!-- or alt+F: not on Windows, in none mode -->
+                <td></td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>moves the cursor to the next word on the right.</td>
             </tr>
         </informaltable>
+        </para>
+    </refsection>
+    <refsection>
+        <title>Examples</title>
+        <programlisting role="example"><![CDATA[
+jdeff org.scilab.modules.preferences.XConfigManager openPreferences prefs;
+prefs general/shortcuts;
+   ]]></programlisting>
+        <para>
+            <inlinemediaobject>
+                <imageobject>
+                    <imagedata fileref="../images/preferences_shortcuts.png" />
+                </imageobject>
+            </inlinemediaobject>
+        </para>
+    </refsection>
+    <refsection role="see also">
+        <title>See Also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="preferences">preferences</link>
+            </member>
+            <member>
+                <link linkend="consolebox">consolebox</link>
+            </member>
+            <member>
+                <link linkend="completion">completion</link>
+            </member>
+            <member>
+                <link linkend="browsehistory">history</link>
+            </member>
+            <member>
+                <link linkend="getscilabmode">getscilabmode</link>
+            </member>
+            <member>
+                <link linkend="scilab">scilab</link>
+            </member>
+        </simplelist>
     </refsection>
 </refentry>
diff --git a/scilab/modules/console/help/images/completion_listbox.png b/scilab/modules/console/help/images/completion_listbox.png
new file mode 100644 (file)
index 0000000..4b6282d
Binary files /dev/null and b/scilab/modules/console/help/images/completion_listbox.png differ
diff --git a/scilab/modules/console/help/images/preferences_shortcuts.png b/scilab/modules/console/help/images/preferences_shortcuts.png
new file mode 100644 (file)
index 0000000..7f22b42
Binary files /dev/null and b/scilab/modules/console/help/images/preferences_shortcuts.png differ
diff --git a/scilab/modules/console/help/ja_JP/console.xml b/scilab/modules/console/help/ja_JP/console.xml
deleted file mode 100644 (file)
index 64f1681..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - DIGITEO - Allan CORNET
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns: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="console" xml:lang="ja">
-    <refnamediv>
-        <refname>console</refname>
-        <refpurpose>コンソールウインドウでのキーボードショートカット</refpurpose>
-    </refnamediv>
-    <refsection>
-        <title>説明</title>
-        <informaltable border="1">
-            <tr>
-                <td>UP or Ctrl+P</td>
-                <td>前の行を呼び出す.</td>
-            </tr>
-            <tr>
-                <td>DOWN or Ctrl+N</td>
-                <td>次の行を呼び出す.</td>
-            </tr>
-            <tr>
-                <td>F1</td>
-                <td>ヘルプをコールする.</td>
-            </tr>
-            <tr>
-                <td>F2</td>
-                <td>コンソールをクリアする.</td>
-            </tr>
-            <tr>
-                <td>F12</td>
-                <td>Windowsでのみコンソールボックスをオープンするo.</td>
-            </tr>
-            <tr>
-                <td>Ctrl+space or TAB</td>
-                <td>補完 : scilab はいくつかの文字で始まる全ての名前のリストを表示します.</td>
-            </tr>
-            <tr>
-                <td>Ctrl + A or HOME</td>
-                <td>カレントの行の始めに移動します.</td>
-            </tr>
-            <tr>
-                <td>Ctrl + B or LEFT</td>
-                <td>カーソルを一文字左に移動します.</td>
-            </tr>
-            <tr>
-                <td>Ctrl + C</td>
-                <td>コンソールで何も選択されていない場合, Scilabの処理を中断します.
-                    選択されている場合,選択されたテキストをクリップボードに送信します.
-                </td>
-            </tr>
-            <tr>
-                <td>Ctrl + D or DELETE</td>
-                <td>カレントの文字を削除します.</td>
-            </tr>
-            <tr>
-                <td>Ctrl + E or END</td>
-                <td>カーソルをコマンド行の最後に移動します.</td>
-            </tr>
-            <tr>
-                <td>Ctrl + F or RIGHT</td>
-                <td>カーソルを一文字右に移動します.</td>
-            </tr>
-            <tr>
-                <td>Ctrl + H or BACKSPACE</td>
-                <td>前の文字を削除します.</td>
-            </tr>
-            <tr>
-                <td>Ctrl + K</td>
-                <td>カーソルから行末までのコマンド行を消去します.</td>
-            </tr>
-            <tr>
-                <td>Ctrl + S</td>
-                <td>全てを選択します.</td>
-            </tr>
-            <tr>
-                <td>Ctrl + U</td>
-                <td>コマンド行全体を削除します.</td>
-            </tr>
-            <tr>
-                <td>Ctrl + V</td>
-                <td>クリップボードから貼り付けを行います.</td>
-            </tr>
-            <tr>
-                <td>Ctrl + W</td>
-                <td>コマンド行の最終ワードを削除します.</td>
-            </tr>
-            <tr>
-                <td>Ctrl + X</td>
-                <td>Scilab割込みを発生します.</td>
-            </tr>
-            <tr>
-                <td>Ctrl + LEFT</td>
-                <td>左に1ワード移動します.</td>
-            </tr>
-            <tr>
-                <td>Ctrl + RIGHT</td>
-                <td>右に1ワード移動します.</td>
-            </tr>
-            <tr>
-                <td>Shift + HOME</td>
-                <td>カーソル位置から命令文の開始位置までを選択します.</td>
-            </tr>
-            <tr>
-                <td>Shift + END</td>
-                <td>カーソル位置から命令文の終了位置までを選択します.</td>
-            </tr>
-            <tr>
-                <td>Double-click</td>
-                <td>カレントワードを選択します.</td>
-            </tr>
-        </informaltable>
-    </refsection>
-</refentry>
index 86497e8..7620bf8 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) 2008 - DIGITEO - Allan CORNET
-*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - DIGITEO - Allan CORNET
  * 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.
  * and continues to be available under such terms.
  * For more information, see the COPYING file which you should have received
  * along with this program.
-*
--->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" scilab:needs-examples="no" xmlns:scilab="http://www.scilab.org" xml:id="console" 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: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="console" xml:lang="ru">
+    <refnamediv xml:id="shortcuts"></refnamediv>
     <refnamediv>
         <refname>console</refname>
-        <refpurpose>сочетания клавиш в командном окне</refpurpose>
+        <refpurpose>Сочетания клавиш, определённые в командном окне</refpurpose>
     </refnamediv>
     <refsection>
         <title>Описание</title>
+        <para>
+            Для трёх режимом запуска Scilab <literal>STD</literal>, <literal>NW</literal> и
+            <literal>NWNI</literal> некоторые сочетания клавиш доступны, когда командное окно
+            находится в фокусе.
+        </para>
+        <para>
+            Предопределения по умолчнию перечислены в следующей таблице. Они могут быть
+            переопределены через <link linkend="preferences">настройки</link> Scilab
+            (Общие/Сочетания клавиш).
+        </para>
+        <warning>
+            <para>
+            Указанное сочетание клавиш могут различать действия в соответствии с компонентом,
+            находящимся в фокусе: командное окно, графическое окно, история команд и т.д.
+            Ниже рассматриваются лишь сочетания клавиш, определённые для панели командного окна.
+            </para>
+        </warning>
+        <para>
         <informaltable border="1">
             <tr>
-                <td>ВВЕРХ или Ctrl+P</td>
-                <td>повторный вызов предыдущей строки.</td>
-            </tr>
-            <tr>
-                <td>ВНИЗ или Ctrl+N</td>
-                <td>повторный вызов следующей строки.</td>
-            </tr>
-            <tr>
-                <td>F1</td>
-                <td>вызов справки.</td>
+                <td><emphasis role="bold">Сочетание клавиш</emphasis></td>
+                <th>STD</th>
+                <th>NW</th>
+                <th>NWNI</th>
+                <td><emphasis role="bold">Действие</emphasis></td>
             </tr>
+            <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
             <tr>
-                <td>F2</td>
-                <td>очистить консоль.</td>
+                <td colspan="5"><refsect3><title>Главные действия</title></refsect3></td>
             </tr>
             <tr>
-                <td>F12</td>
-                <td>открывает консоль в отдельном окне (только в Windows).</td>
+                <td>ALT</td>
+                <td align="center">x</td>
+                <td align="center"></td>
+                <td align="center"></td>
+                <td>Установка/снятие фокуса с меню командного окна. Затем с помощью стрелок и/или
+                    активацией подчёркнутых клавиш в пунктах меню производится навигация по меню.
+                </td>
             </tr>
             <tr>
                 <td>Ctrl+пробел или TAB</td>
-                <td>
-                    дополнение : Scilab отображает список всех имён, которые начинаются
-                    с некоторых символов.
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>дополнение : Scilab отображает список всех имён, которые начинаются с некоторых символов.
+                    <para/>
+                    <inlinemediaobject>
+                        <imageobject>
+                            <imagedata fileref="../images/completion_listbox.png" />
+                        </imageobject>
+                    </inlinemediaobject>
                 </td>
             </tr>
             <tr>
-                <td>Ctrl + A или HOME</td>
-                <td>переход в начало текущей строки.</td>
+                <td>F1</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td></td>
+                <td>открывает браузер справки или выводит её на передний план</td>
             </tr>
             <tr>
-                <td>Ctrl + B или LEFT</td>
-                <td>перевод курсора на один символ влево.</td>
+                <td>F12</td>
+                <td align="center">x</td>
+                <td></td>
+                <td></td>
+                <td>открывает поле командного окна (только в Windows)</td>
+            </tr>
+            <tr>
+                <td>F3 или Ctrl + F</td>
+                <td align="center">x</td>
+                <td></td>
+                <td></td>
+                <td>открывает диалог поиска в содержимом командного окна</td>
             </tr>
             <tr>
                 <td>Ctrl + C</td>
-                <td>
-                    прерывание работы Scilab, если ничего не выбрано в консоли,
-                    иначе выбранный текст копируется в буфер обмена.
-                </td>
+                <td align="center">x</td>
+                <td></td>
+                <td></td>
+                <td>копирует выделение в буфер обмена</td>
             </tr>
             <tr>
-                <td>Ctrl + D или DELETE</td>
-                <td>удаляет текущий символ.</td>
+                <td>Ctrl + C</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>прерывает исполнение</td>
             </tr>
             <tr>
-                <td>Ctrl + E или END</td>
-                <td>перемещает курсор в конец командной строки.</td>
+                <td>Ctrl + V</td>
+                <td align="center">x</td>
+                <td></td>
+                <td></td>
+                <td>вставляет содержимое буфера обмена</td>
             </tr>
             <tr>
-                <td>Ctrl + F или RIGHT</td>
-                <td>перемещает курсор на один символ вправо.</td>
+                <td>Ctrl + V</td>
+                <td></td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>заменяет окончание строки содержимым буфера обмена</td>
             </tr>
             <tr>
-                <td>Ctrl + H или BACKSPACE</td>
-                <td>удаляет предыдущий символ.</td>
+                <td>Ctrl + X</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>(Прерывает Scilab)</td>
             </tr>
+<!--
+                <td>Ctrl + F</td><td>Opens the search/Find dialog for the Console content</td>
+                <td>Ctrl + U</td><td>kills command line from cursor to beginning.</td>
+-->
+            <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
             <tr>
-                <td>Ctrl + K</td>
-                <td>убивает командную строку от курсора до конца.</td>
+                <td colspan="5"><refsect3><title>История</title></refsect3></td>
             </tr>
             <tr>
-                <td>Ctrl + S</td>
-                <td>выбирает всё.</td>
+                <td>ВВЕРХ</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>вызывает предыдущую строку</td>
             </tr>
             <tr>
-                <td>Ctrl + U</td>
-                <td>удаляет командную строку целиком.</td>
+                <td>Ctrl + P</td>
+                <td></td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>вызывает предыдущую строку</td>
             </tr>
             <tr>
-                <td>Ctrl + V</td>
-                <td>делает вставку из буфера обмена.</td>
+                <td>ВНИЗ</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>вызывает следующую строку</td>
             </tr>
             <tr>
-                <td>Ctrl + W</td>
-                <td>удаляет последнее слово командной строки.</td>
+                <td>Ctrl + N</td>
+                <td></td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>вызывает следующую строку</td>
             </tr>
             <tr>
-                <td>Ctrl + X</td>
-                <td>прерывает работу Scilab'а</td>
+                <td valign='top'>!abc&lt;enter></td>
+                <td align="center">x</td>
+                <td></td>
+                <td></td>
+                <td>
+                    вызывает последнюю строку, начинающуюся с 'abc' ('!' доллжен быть самым первым символов в строке)
+                </td>
             </tr>
+            <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
             <tr>
-                <td>Ctrl + ВЛЕВО</td>
-                <td>перемещение на одно слово влево.</td>
+                <td colspan="5"><refsect3><title>Выделение</title></refsect3></td>
             </tr>
             <tr>
-                <td>Ctrl + RIGHT</td>
-                <td>перемещение на одно слово вправо.</td>
+                <td>Ctrl + S</td>
+                <td align="center">x</td>
+                <td></td>
+                <td></td>
+                <td>выделяет всё содержимое командного окна</td>
             </tr>
             <tr>
                 <td>Shift + HOME</td>
-                <td>выбор от курсора до начала инструкции.</td>
+                <td align="center">x</td>
+                <td></td>
+                <td></td>
+                <td>выделяет от курсора до начала строки</td>
             </tr>
             <tr>
                 <td>Shift + END</td>
-                <td>выбор от курсора до конца инструкции.</td>
+                <td align="center">x</td>
+                <td></td>
+                <td></td>
+                <td>выделяет от курсора до конца строки</td>
             </tr>
             <tr>
-                <td>Double-click</td>
-                <td>выбор текущего слова.</td>
+                <td>двойной щелчок</td>
+                <td align="center">x</td>
+                <td></td>
+                <td align="center">x</td>
+                <td>выбирает текущее слово</td>
             </tr>
-        </informaltable>
-    </refsection>
-    <refnamediv>
-        <refname>console cli</refname>
-        <refpurpose>сочетания клавиш в неграфическом режиме NW/NWNI</refpurpose>
-    </refnamediv>
-    <refsection>
-        <title>Описание</title>
-        <informaltable border="1">
+            <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
             <tr>
-                <td>ВВЕРХ или Ctrl+P</td>
-                <td>повторный вызов предыдущей строки.</td>
+                <td colspan="5"><refsect3><title>Удаление</title></refsect3></td>
             </tr>
             <tr>
-                <td>ВНИЗ или Ctrl+N</td>
-                <td>повторный вызов следующей строки.</td>
+                <td>F2</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>очищает командное окно, как <link linkend="clc">clc</link></td>
             </tr>
             <tr>
-                <td>TAB</td>
-                <td>
-                    дополнение: Scilab отображает список всех имён, которые
-                    начинаются с некоторых.
-                </td>
+                <td>Ctrl + D или DELETE</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>удаляет текущий символ (или справа)</td>
             </tr>
             <tr>
-                <td>Ctrl + A или HOME</td>
-                <td>перемещение в начало текущей строки.</td>
+                <td>Ctrl + H или BACKSPACE</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>удаляет предыдущий символ</td>
             </tr>
             <tr>
-                <td>Ctrl + B или ВЛЕВО</td>
-                <td>перемещает курсор на один символ влево.</td>
+                <td>Ctrl + K</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>удаляет конец строки (от курсора до конца)</td>
             </tr>
             <tr>
-                <td>Ctrl + D или DELETE</td>
-                <td>удаляет текущий символ.</td>
+                <td>Ctrl + U</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>удаляет целиком командную строку</td>
             </tr>
             <tr>
-                <td>Ctrl + E или END</td>
-                <td>перемещает курсор в конец командной строки.</td>
+                <td>Ctrl + W</td>
+                <td align="center">x</td>
+                <td></td>
+                <td></td>
+                <td>удаляет последнее слово в строке, отделённое пробелом</td>
             </tr>
             <tr>
-                <td>Ctrl + F или RIGHT</td>
-                <td>перемещает курсор на один символ вправо.</td>
+                <td>Ctrl + W</td>
+                <td></td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>удаляет слово, на котором стоит курсор, и конец строки</td>
             </tr>
+            <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
             <tr>
-                <td>Ctrl + H или BACKSPACE</td>
-                <td>удаляет предыдущий символ.</td>
+                <td colspan="5"><refsect3><title>Перемещения курсора</title></refsect3></td>
             </tr>
             <tr>
-                <td>Ctrl + K</td>
-                <td>удаляет командную строку от курсора до конца.</td>
+                <td>Ctrl + A или HOME</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>перемещает курсор в начало текущей строки</td>
             </tr>
             <tr>
-                <td>Ctrl + U</td>
-                <td>удаляет командную строку от курсора до начала.</td>
+                <td>Ctrl + B или ВЛЕВО</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>перемещает курсор на один символ назад, влево</td>
             </tr>
             <tr>
-                <td>Ctrl + W</td>
-                <td>удаляет предыдущее слово от курсора.</td>
+                <td>Ctrl + ВЛЕВО</td>
+                <td></td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>перемещает курсор в начало текущего или предыдущего слова</td>
+            </tr>
+            <!--
+            <tr>
+                <td>Alt+B</td>
+                <td>перемещает влево на одно слово</td>
             </tr>
+            -->
             <tr>
-                <td>Alt+B или Ctrl+ВЛЕВО</td>
-                <td>перемещение на одно слово влево.</td>
+                <td>Ctrl + E или END</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>перемещает курсор в конец командной строки</td>
             </tr>
             <tr>
-                <td>Alt+F или Ctrl+ВПРАВО</td>
-                <td>перемещение на одно слово вправо.</td>
+                <td>Ctrl + F</td>
+                <td></td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>перемещает курсор на один симовл вперёд, вправо</td>
+            </tr>
+            <tr>
+                <td>ВПРАВО</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>перемещает курсор на один символ вправо</td>
+            </tr>
+            <tr>
+                <td>Ctrl + ВПРАВО</td> <!-- или alt+F: не в Windows, в режиме none -->
+                <td></td>
+                <td align="center">x</td>
+                <td align="center">x</td>
+                <td>перемещает курсор к следующему слову справа</td>
             </tr>
         </informaltable>
+        </para>
+    </refsection>
+    <refsection>
+        <title>Примеры</title>
+        <programlisting role="example"><![CDATA[
+jdeff org.scilab.modules.preferences.XConfigManager openPreferences prefs;
+prefs general/shortcuts;
+   ]]></programlisting>
+        <para>
+            <inlinemediaobject>
+                <imageobject>
+                    <imagedata fileref="../images/preferences_shortcuts.png" />
+                </imageobject>
+            </inlinemediaobject>
+        </para>
+    </refsection>
+    <refsection role="see also">
+        <title>Смотрите также</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="preferences">настройки</link>
+            </member>
+            <member>
+                <link linkend="consolebox">панель командного окна</link>
+            </member>
+            <member>
+                <link linkend="completion">дополнение</link>
+            </member>
+            <member>
+                <link linkend="browsehistory">история команд</link>
+            </member>
+            <member>
+                <link linkend="getscilabmode">getscilabmode</link>
+            </member>
+            <member>
+                <link linkend="scilab">scilab</link>
+            </member>
+        </simplelist>
     </refsection>
 </refentry>
-