calligraphy and paintbucket update

diff --git a/doc/keys.html b/doc/keys.html
index 03600d2319c8d4dc1769be9f49bfecaec2cfa90a..24bac49968cfd4965fed6150ab20ac94ae01f7be 100644 (file)
--- a/doc/keys.html
+++ b/doc/keys.html
@@ -17,7 +17,7 @@ are configurable by the user; see the default.xml file for details on how to do
 supposed to work the same as corresponding regular keys. If you have a new shortcut
 idea, please contact the developers (by writing to the <a href="http://lists.sourceforge.net/lists/listinfo/inkscape-devel">devel mailing list</a>
 or by <a href="http://sourceforge.net/tracker/?group_id=93438&amp;atid=604309">submitting an
-RFE</a>).</p><p class="contents"><strong>Contents:</strong>  <a href="#Tools">Tools</a> | <a href="#Dialogs">Dialogs</a> | <a href="#Controls bar">Controls bar</a> | <a href="#Canvas">Canvas</a> | <a href="#Palette">Palette</a> | <a href="#File">File</a> | <a href="#Window">Window</a> | <a href="#Layers">Layers</a> | <a href="#Object">Object</a> | <a href="#Path">Path</a> | <a href="#Selector">Selector</a> | <a href="#Node tool">Node tool</a> | <a href="#Rectangle tool">Rectangle tool</a> | <a href="#Ellipse tool">Ellipse tool</a> | <a href="#Star tool">Star tool</a> | <a href="#Spiral tool">Spiral tool</a> | <a href="#Zoom tool">Zoom tool</a> | <a href="#Pencil tool">Pencil tool</a> | <a href="#Pen (Bezier) tool">Pen (Bezier) tool</a> | <a href="#Calligraphy">Calligraphy</a> | <a href="#Gradient tool">Gradient tool</a> | <a href="#Dropper tool">Dropper tool</a> | <a href="#Text tool">Text tool</a></p><center><table border="0" cellspacing="0" cellpadding="4" width="100%"><tr><td colspan="3"><a name="Tools"></a><h1>Tools</h1></td></tr>
+RFE</a>).</p><p class="contents"><strong>Contents:</strong>  <a href="#Tools">Tools</a> | <a href="#Dialogs">Dialogs</a> | <a href="#Controls bar">Controls bar</a> | <a href="#Canvas">Canvas</a> | <a href="#Palette">Palette</a> | <a href="#File">File</a> | <a href="#Window">Window</a> | <a href="#Layers">Layers</a> | <a href="#Object">Object</a> | <a href="#Path">Path</a> | <a href="#Selector">Selector</a> | <a href="#Node tool">Node tool</a> | <a href="#Rectangle tool">Rectangle tool</a> | <a href="#Ellipse tool">Ellipse tool</a> | <a href="#Star tool">Star tool</a> | <a href="#Spiral tool">Spiral tool</a> | <a href="#Zoom tool">Zoom tool</a> | <a href="#Pencil tool">Pencil tool</a> | <a href="#Pen (Bezier) tool">Pen (Bezier) tool</a> | <a href="#Calligraphy">Calligraphy</a> | <a href="#Paint Bucket">Paint Bucket</a> | <a href="#Gradient tool">Gradient tool</a> | <a href="#Dropper tool">Dropper tool</a> | <a href="#Text tool">Text tool</a></p><center><table border="0" cellspacing="0" cellpadding="4" width="100%"><tr><td colspan="3"><a name="Tools"></a><h1>Tools</h1></td></tr>
 
 
 <tr bgcolor="f5f5f5"><td align="right"><span class="key">F1</span>,
@@ -37,7 +37,7 @@ RFE</a>).</p><p class="contents"><strong>Contents:</strong>  <a href="#Tools">To
 <tr bgcolor="f5f5f5"><td align="right"><span class="key">Shift+F6</span>,
 <span class="key">b</span></td><td><span class="action">Bezier (Pen) tool</span></td></tr>
 <tr bgcolor="f5f5f5"><td align="right"><span class="key">Ctrl+F6</span>,
-<span class="key">c</span></td><td><span class="action">Calligraphic tool</span></td></tr>
+<span class="key">c</span></td><td><span class="action">Calligraphy tool</span></td></tr>
 <tr bgcolor="f5f5f5"><td align="right"><span class="key">Shift+F7</span>,
 <span class="key">u</span></td><td><span class="action">Paint Bucket tool</span></td></tr>
 <tr bgcolor="f5f5f5"><td align="right"><span class="key">Ctrl+F1</span>,
@@ -942,13 +942,31 @@ groups) with the same effect as Alt+click.)</span></td></tr>
 <tr><td colspan="3"><a name="Calligraphy"></a><h1>Calligraphy</h1></td></tr>
 
 <tr bgcolor="e9dfef"><td align="right"><span class="key">mouse drag</span></td><td><span class="action">draw a calligraphic line</span></td></tr>
+<tr bgcolor="e9dfef"><td align="right"><span class="key">Shift+mouse drag</span></td><td><span class="action">add to selected path</span></td></tr>
+<tr bgcolor="e9dfef"><td colspan="3"><span class="note">Drawing with Shift unions the newly created stroke with the previous selection</span></td></tr>
+<tr bgcolor="e9dfef"><td align="right"><span class="key">Ctrl+mouse drag</span></td><td><span class="action">track a guide path</span></td></tr>
+<tr bgcolor="e9dfef"><td colspan="3"><span class="note">Drawing with Ctrl tracks a selected guide path at the constant distance</span></td></tr>
+<tr bgcolor="e9dfef"><td align="right"><span class="key">Alt+mouse drag</span></td><td><span class="action">thin selected paths</span></td></tr>
+<tr bgcolor="e9dfef"><td align="right"><span class="key">Shift+Alt+mouse drag</span></td><td><span class="action">thicken selected paths</span></td></tr>
+<tr bgcolor="e9dfef"><td colspan="3"><span class="note">Dragging with Alt or Shift+Alt over selected paths makes them thinner/thicker where you drag</span></td></tr>
 <tr bgcolor="e9dfef"><td align="right"><span class="key">Left arrow</span>,
-<span class="key">Right arrow</span></td><td><span class="action">adjust pen width</span></td></tr>
+<span class="key">Right arrow</span></td><td><span class="action">adjust pen width by 1</span></td></tr>
+<tr bgcolor="e9dfef"><td align="right"><span class="key">Home</span>,
+<span class="key">End</span></td><td><span class="action">set pen width to 1 or 100</span></td></tr>
 <tr bgcolor="e9dfef"><td align="right"><span class="key">Up arrow</span>,
 <span class="key">Down arrow</span></td><td><span class="action">adjust pen angle</span></td></tr>
 <tr bgcolor="e9dfef"><td colspan="3"><span class="note">Width and angle can be adjusted while drawing. </span></td></tr>
 <tr bgcolor="e9dfef"><td align="right"><span class="key">Esc</span></td><td><span class="action">deselect</span></td></tr>
 
+<tr><td colspan="3"><a name="Paint Bucket"></a><h1>Paint Bucket</h1></td></tr>
+
+<tr bgcolor="f2f9da"><td align="right"><span class="key">click</span></td><td><span class="action">fill a bounded area</span></td></tr>
+<tr bgcolor="f2f9da"><td align="right"><span class="key">Shift+click</span></td><td><span class="action">add to selected path</span></td></tr>
+<tr bgcolor="f2f9da"><td colspan="3"><span class="note">Clicking with Shift unions the newly created fill with the previous selection</span></td></tr>
+<tr bgcolor="f2f9da"><td align="right"><span class="key">Ctrl+click</span></td><td><span class="action">set fill color</span></td></tr>
+<tr bgcolor="f2f9da"><td align="right"><span class="key">Shift+Ctrl+click</span></td><td><span class="action">set stroke color</span></td></tr>
+<tr bgcolor="f2f9da"><td colspan="3"><span class="note">Ctrl+clicking an object sets its fill (or stroke with Shift) to the tool's current style</span></td></tr>
+
 <tr><td colspan="3"><a name="Gradient tool"></a><h1>Gradient tool</h1></td></tr>
 
 <tr bgcolor="e9f3e7"><td colspan="3"><h4>Creating gradients</h4></td></tr>

diff --git a/doc/keys.xml b/doc/keys.xml
index dd0716778a3ad21682b14af596c0c4421fa04d62..ad110a21a5269532121c19af6902b3e67032c024 100644 (file)
--- a/doc/keys.xml
+++ b/doc/keys.xml
@@ -25,7 +25,7 @@ RFE</a>).</p>
 <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><ctrl/><keyf f="F6"/></key><key>c</key>      <action>Calligraphic tool</action></keys>
+<keys><key><ctrl/><keyf f="F6"/></key><key>c</key>      <action>Calligraphy 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>
@@ -970,13 +970,32 @@ groups) with the same effect as Alt+click.)</note>
 *<section title="Calligraphy" color="e9dfef">
 <group>
 <mouse><key><left-drag/></key> <action>draw a calligraphic line</action></mouse>
-<mouse><key><left-arrow/></key> <key><right-arrow/></key> <action>adjust pen width</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><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><alt/><left-drag/></key> <action>thin selected paths</action></mouse>
+<mouse><key><shift/><alt/><left-drag/></key> <action>thicken selected paths</action></mouse>
+<note>Dragging with Alt or Shift+Alt over selected paths makes them thinner/thicker where you drag</note>
+<mouse><key><left-arrow/></key> <key><right-arrow/></key> <action>adjust pen width by 1</action></mouse>
+<mouse><key><misc f="Home"/></key> <key><misc f="End"/></key> <action>set pen width to 1 or 100</action></mouse>
 <mouse><key><up/></key> <key><down/></key> <action>adjust pen angle</action></mouse>
 <note>Width and angle can be adjusted while drawing. </note>
 <keys><key><misc f="Esc"/></key> <action>deselect</action></keys>
 </group>
 </section>
 
+*<section title="Paint Bucket" color="f2f9da">
+<group>
+<mouse><key><left-click/></key> <action>fill a bounded area</action></mouse>
+<mouse><key><shift/><left-click/></key> <action>add to selected path</action></mouse>
+<note>Clicking with Shift unions the newly created fill with the previous selection</note>
+<mouse><key><ctrl/><left-click/></key> <action>set fill color</action></mouse>
+<mouse><key><shift/><ctrl/><left-click/></key> <action>set stroke color</action></mouse>
+<note>Ctrl+clicking an object sets its fill (or stroke with Shift) to the tool's current style</note>
+</group>
+</section>
+
 *<section title="Gradient tool" color="e9f3e7">
 <group>
 <title>Creating gradients</title>