diff --git a/doc/keys.xml b/doc/keys.xml
index d422676cf19d4f9c0676fee8edd3b01f368342c8..20258dcf5b96c2a299df2e0764812c2ffc15ec37 100644 (file)
--- a/doc/keys.xml
+++ b/doc/keys.xml
<keys><key><keyf f="F4"/></key><key>r</key> <action>Rectangle tool</action></keys>
<keys><key><shift/><keyf f="F4"/></key><key>x</key> <action>3D box tool</action></keys>
<keys><key><keyf f="F5"/></key><key>e</key> <action>Ellipse/arc tool</action></keys>
-<keys><key><keyf f="F6"/></key><key>p</key> <action>Freehand (Pencil) tool</action></keys>
-<keys><key><shift/><keyf f="F6"/></key><key>b</key> <action>Bezier (Pen) tool</action></keys>
+<keys><key><keyf f="F6"/></key><key>p</key> <action>Pencil (Freehand) tool</action></keys>
+<keys><key><shift/><keyf f="F6"/></key><key>b</key> <action>Pen (Bezier) tool</action></keys>
<keys><key><ctrl/><keyf f="F6"/></key><key>c</key> <action>Calligraphy tool</action></keys>
+<keys><key><shift/><keyf f="E"/></key><key>c</key> <action>Eraser tool</action></keys>
<keys><key><shift/><keyf f="F7"/></key><key>u</key> <action>Paint Bucket tool</action></keys>
<keys><key><ctrl/><keyf f="F1"/></key><key>g</key> <action>Gradient tool</action></keys>
<keys><key><keyf f="F7"/></key><key>d</key> <action>Dropper tool</action></keys>
<note>When the "Mouse wheel zooms by default" option is on in Preferences, Ctrl+wheel scrolls instead of zooming. To zoom, use wheel without Ctrl.</note>
<mouse><key><shift/><mid-drag/></key> <action>zoom into the area</action></mouse>
<keys><key><alt/>Z</key> <action>activate zoom field</action></keys>
-<note>The zoom field in the lower left corner of the window allows you to specify zoom level precisely.</note>
+<note>The zoom field in the lower right corner of the window allows you to specify zoom level precisely.</note>
</group>
<group>
<title>Guides, grids, snapping</title>
<mouse><key><left-drag/></key> <action>drag off a ruler to create guide</action></mouse>
<note>Drag off the horizontal or vertical ruler to create a new guideline. Drag a guideline onto the ruler to delete it.</note>
+<mouse><key><left-drag/></key> <action>drag a guide to move it</action></mouse>
+<mouse><key><shift/><left-drag/></key> <action>drag a guide (not near anchor) to rotate it</action></mouse>
+<mouse><key><ctrl/><shift/><left-drag/></key> <action>rotate guide with angle snapping</action></mouse>
+<mouse><key><ctrl/><left-click/></key> <action>delete guide</action></mouse>
<keys><key>|</key> <key><shift/>\</key> <action>toggle guides and snapping to guides</action></keys>
<note>If you want to see the guides but not snap to them, use the global snapping toggle (% key).</note>
<note>When you create a new guide by dragging off the ruler, guide visibility and snapping are turned on.</note>
<note>These keys work both in the floating palette dialog and in the palette frame at the bottom of the window.</note>
<mouse><key><left-click/></key> <action>set fill color on selection</action></mouse>
<mouse><key><shift/><left-click/></key> <action>set stroke color on selection</action></mouse>
-<mouse><key><right-click/></key> <action>set stroke color on selection</action></mouse>
+<mouse><key><right-click/></key> <action>open pop-up menu</action></mouse>
<mouse><key><left-drag/></key> <action>drag fill color to objects</action></mouse>
<mouse><key><shift/><left-drag/></key> <action>drag stroke color to objects</action></mouse>
<note>To change fill/stroke of an object by dragging color on it, that object need not be selected.</note>
<group>
<keys><key><ctrl/>N</key> <action>create new document</action></keys>
-<keys><key><ctrl/>O</key> <action>open an SVG document</action></keys>
+<keys><key><ctrl/>O</key> <action>open a document</action></keys>
<keys><key><shift/><ctrl/>E</key> <action>export to PNG</action></keys>
-<keys><key><ctrl/>I</key> <action>import bitmap or SVG</action></keys>
+<keys><key><ctrl/>I</key> <action>import bitmap or vector</action></keys>
<keys><key><ctrl/>P</key> <action>print document</action></keys>
<keys><key><ctrl/>S</key> <action>save document</action></keys>
<keys><key><shift/><ctrl/>S</key> <action>save under a new name</action></keys>
</section>
*<section title="Layers" color="f6f9d9">
+
+<group>
+<keys><key><shift/><ctrl/><misc f="N"/></key> <action>create new layer</action></keys>
+</group>
+
<group>
<keys><key><shift/><misc f="PgUp"/></key> <action>move to layer above</action></keys>
<keys><key><shift/><misc f="PgDn"/></key> <action>move to layer below</action></keys>
<group>
<title>Clipboard</title>
<keys><key><ctrl/>C</key> <action>copy selection</action></keys>
-<note>This places a copy of the selection to the Inkscape clipboard. Text from text objects is also placed onto the system clipboard.</note>
<keys><key><ctrl/>X</key> <action>cut selection</action></keys>
-<note>This works the same as "copy selection" followed by deleting the selection.</note>
<keys><key><ctrl/>V</key> <action>paste clipboard</action></keys>
<note>This places the clipboard objects at the mouse cursor, or at the center of the window if mouse is outside the canvas.</note>
-<note>When editing text with the text tool, this pastes the text from the system clipboard into the current text object.</note>
+<note>When editing text with the text tool, this pastes the text from the clipboard into the current text object.</note>
<keys><key><ctrl/><alt/>V</key> <action>paste in place</action></keys>
-<note>This places the clipboard objects to the original location from which they were copied.</note>
+<note>This places the clipboard objects into the original location from which they were copied.</note>
<keys><key><shift/><ctrl/>V</key> <action>paste style</action></keys>
<note>This applies the style of the (first of the) copied object(s) to the current selection.</note>
<note>If a gradient handle (in Gradient tool) or a text span (in Text tool) are selected, they get the style instead of the entire object.</note>
<note>Shift+click adds an object to the current selection if it was not selected, or deselects it otherwise.</note>
<mouse><key><left-click/><left-click/></key> <action>edit the object</action></mouse>
<note>For paths, double clicking switches to Node tool; for shapes, to corresponding shape tool; for text, to Text tool.</note>
-<note>For groups, double clicking performs the "Enter group" command (the group becomes temporary layer).</note>
-<note>Double clicking in empty space swithes to the parent layer in the hierarchy, if any.</note>
+<note>For groups, double clicking performs the "Enter group" command (the group becomes a temporary layer).</note>
+<note>Double clicking in empty space switches to the parent layer in the hierarchy, if any.</note>
</group>
<group>
<note>On Linux, Alt+click and Alt+drag may be reserved by the window manager. Reconfigure it so you can use them in Inkscape.</note>
<mouse><key><ctrl/><left-drag/></key> <action>restrict movement to horizontal or vertical</action></mouse>
<mouse><key><shift/><left-drag/></key> <action>temporarily disable snapping</action></mouse>
-<note>This temporaily disables snapping to grid or guides when you are dragging with grid or guides on.</note>
+<note>This temporarily disables snapping to grid or guides when you are dragging with grid or guides on.</note>
<mouse><key><left-drag/><misc-wide f="Space"/></key> <action>drop a copy</action></mouse>
<note>When dragging or transforming with mouse, each Space leaves a copy of the selected object.</note>
<note>You can press and hold Space while dragging for a nice "trail."</note>
with the segment; another Shift+S will expand a second handle</note>
<keys><key><shift/>Y</key> <action>make symmetric</action></keys>
<note>When making smooth or symmetric, you can lock the position of one of the handles by hovering mouse over it.</note>
-<mouse><key><ctrl/><left-click/></key> <action>toggle smooth/cusp/symmetric</action></mouse>
+<keys><key><shift/>A</key> <action>make auto</action></keys>
+<mouse><key><ctrl/><left-click/></key> <action>toggle smooth/cusp/symmetric/auto</action></mouse>
</group>
<group>
<note>See the corresponding shape tools for their editing shortcuts, all of which also work in node tool.</note>
</group>
+<group>
+<title>Edit fills and path effects</title>
+<note>Node tool can also edit the handles of a pattern fill, gradient fill, and the editable handles of path effects.</note>
+</group>
+
<group>
<title>Cancel</title>
<keys><key><misc f="Esc"/></key> <action>cancel rubberband or move</action></keys>
<group>
<title>Operation</title>
<mouse><key><left-drag/></key> <action>act on selected paths in the current mode</action></mouse>
+<mouse><key><shift/><left-drag/></key> <action>reverse current mode (when applicable)</action></mouse>
<mouse><key><ctrl/><left-drag/></key> <action>act temporarily switching to shrink mode</action></mouse>
<mouse><key><ctrl/><shift/><left-drag/></key> <action>act temporarily switching to grow mode</action></mouse>
<note>The amount of tweaking action is the greatest at the center of the circular area and drops off smoothly towards the edges.</note>
<group>
<title>Modes</title>
-<keys><key><shift/>p</key> <action>push mode</action></keys>
-<keys><key><shift/>s</key> <action>shrink (inset) mode</action></keys>
-<keys><key><shift/>g</key> <action>grow (outset) mode</action></keys>
-<keys><key><shift/>a</key> <action>attract mode</action></keys>
-<keys><key><shift/>e</key> <action>repel mode</action></keys>
-<keys><key><shift/>r</key> <action>roughen mode</action></keys>
+<keys><key><shift/>m</key><key><shift/>0</key> <action>move mode</action></keys>
+<keys><key><shift/>i</key><key><shift/>1</key> <action>move in/out mode</action></keys>
+<note>Drag moves objects inwards to cursor, drag with Shift moves outwards from cursor</note>
+<keys><key><shift/>z</key><key><shift/>2</key> <action>move jitter mode</action></keys>
+<keys><key><shift/><</key><key><shift/>></key><key><shift/>3</key> <action>scale mode</action></keys>
+<note>Drag scales objects down, drag with Shift scales up</note>
+<keys><key><shift/>[</key><key><shift/>]</key><key><shift/>4</key> <action>rotate mode</action></keys>
+<note>Drag rotates objects clockwise, drag with Shift, counterclockwise</note>
+<keys><key><shift/>d</key><key><shift/>5</key> <action>duplicate/delete mode</action></keys>
+<note>Drag randomly duplicates objects, drag with Shift randomly deletes</note>
+<keys><key><shift/>p</key><key><shift/>6</key> <action>push path mode</action></keys>
+<keys><key><shift/>s</key><key><shift/>7</key> <action>shrink/grow path mode</action></keys>
+<note>Drag insets paths, drag with Shift outsets</note>
+<keys><key><shift/>a</key><key><shift/>8</key> <action>attract/repel path mode</action></keys>
+<note>Drag attracts paths to cursor, drag with Shift repels</note>
+<keys><key><shift/>r</key><key><shift/>9</key> <action>roughen mode</action></keys>
<keys><key><shift/>c</key> <action>color paint mode</action></keys>
<keys><key><shift/>j</key> <action>color jitter mode</action></keys>
+<keys><key><shift/>b</key> <action>blur mode</action></keys>
</group>
<group>
<group>
<title>Edit by handles</title>
-<note>All editing operations occur "in perspective", i.e., either along PLs or within planes spanned by these.</note>
+<note>All editing operations occur "in perspective", i.e., either along perspective lines or within planes spanned by these.</note>
<mouse><key><left-drag/></key> <action>resize/move box</action></mouse>
-<note>The four front handles and the center normally move withing the XY-plane, the four rear handles along the Z-axis.</note>
+<note>The four front handles and the center normally move within the XY plane, the four rear handles along the Z axis.</note>
<mouse><key><shift/><left-drag/></key> <action>resize/move (with handle behaviour swapped)</action></mouse>
<mouse><key><ctrl/><left-drag/></key> <action>resize/move (handles snap to axes or diagonals)</action></mouse>
</group>
<keys><key><alt/>{</key> <key><alt/>}</key> <action>rotate Z-PLs (if parallel) by 1 pixel</action></keys>
</group>
+<!--
<group>
<title>Visual appearance</title>
<keys><key>L</key> <action>toggle visibility of PLs</action></keys>
<keys><key>A</key> <action>toggle PLs to all corners/only front corners</action></keys>
</group>
+-->
</section>
*<section title="Ellipse tool" color="ffece8">
<group>
<title>Draw</title>
-<note>Without Alt the starting end ending point of the mouse drag mark the corners of the bounding box.</note>
+<note>Without Alt the starting and ending point of the mouse drag mark the corners of the bounding box.</note>
<note>With Alt the ellipse is enlarged so that its circumference passes through these two points (Ctrl+Alt is a special case; see below).</note>
<mouse><key><left-drag/></key> <action>draw an ellipse</action></mouse>
<mouse><key><ctrl/><left-drag/></key> <action>make circle or integer-ratio ellipse</action></mouse>
<mouse><key><shift/><left-drag/></key> <action>add to selected path</action></mouse>
<note>If a path is selected, Shift+dragging anywhere creates a new subpath instead of a new independent path.</note>
<mouse><key><shift/><left-drag/></key> <action>temporarily disable snapping</action></mouse>
-<note>Shift also temporaily disables snapping to grid or guides when you are drawing with grid or guides on.</note>
+<note>Shift also temporarily disables snapping to grid or guides when you are drawing with grid or guides on.</note>
+<mouse><key><alt/><left-drag/></key> <action>averaging draw (sketch mode)</action></mouse>
</group>
-
<group>
<title>Create dots</title>
<mouse><key><ctrl/><left-click/></key> <action>create a dot</action></mouse>
<note>If no path is being created, this starts a new path.</note>
<mouse><key><shift/><left-click/></key> <action>add to selected path</action></mouse>
<note>If a path is selected, Shift+clicking anywhere starts a new subpath instead of a new independent path.</note>
-<mouse><key><left-drag/></key> <action>create a bezier node with two handles</action></mouse>
+<mouse><key><left-drag/></key> <action>create a Bezier node with two handles</action></mouse>
<mouse><key><shift/><left-drag/></key> <action>move only one handle</action></mouse>
<!-- FIXME: also disables snapping! another conflict -->
<note>This moves only one handle (instead of both) while creating a node, making it cusp.</note>
<mouse><key><left-drag/></key> <action>draw a calligraphic line</action></mouse>
<mouse><key><shift/><left-drag/></key> <action>add to selected path</action></mouse>
<note>Drawing with Shift unions the newly created stroke with the previous selection</note>
+<mouse><key><alt/><left-drag/></key> <action>subtract from selected path</action></mouse>
+<note>Drawing with Alt subtracts the newly created stroke from the previous selection</note>
<mouse><key><ctrl/><left-drag/></key> <action>track a guide path</action></mouse>
<note>Drawing with Ctrl tracks a selected guide path at the constant distance</note>
<mouse><key><left-arrow/></key> <key><right-arrow/></key> <action>adjust pen width by 1</action></mouse>
<mouse><key><alt/><left-click/></key> <key><alt/><left-drag/></key> <key><ctrl/><alt/><left-click/></key> <key><ctrl/><alt/><left-drag/></key> <action>pick inverse color</action></mouse>
<note>If Alt is pressed, picking color (with or without Shift, by click or by drag) picks the inverse of the color.</note>
<keys><key><ctrl/>C</key> <action>copy color</action></keys>
-<note>This copies the color under cursor to the system clipboard, as text in RRGGBBAA format (8 hex digits).</note>
+<note>This copies the color under cursor to the clipboard, as text in RRGGBBAA format (8 hex digits).</note>
</group>
</section>