copy-editing chapter 20.

diff --git a/STYLE_GUIDE b/STYLE_GUIDE
index 001b2a72c65b23041400ab5aebe7d9c36e04b035..f9d4ce2786f85b9c4cbc72471974e76a2a5114cf 100644 (file)
--- a/STYLE_GUIDE
+++ b/STYLE_GUIDE
@@ -114,14 +114,15 @@ is renamed or moved to another sub-directory, links should be ok.
 <dfn>
 encloses a newly introduced term that is being explained. Use for the first
 occurrence of the main concept of every manual page, or the first occurrence
 <dfn>
 encloses a newly introduced term that is being explained. Use for the first
 occurrence of the main concept of every manual page, or the first occurrence

-of a new concept after a sub-heading if necessary.
+of a new concept after a sub-heading if necessary. Renders in bold face.

 Keep in mind that <dfn> tags might be used to generate an index of keywords
 - don't pollute it too much.
 
 <abbr>
 is used to explain an abbreviation such as <abbr title="Linux Audio
 Developers Simple Plugin API">LADSPA</abbr>. Browsers will usually pop up the
 Keep in mind that <dfn> tags might be used to generate an index of keywords
 - don't pollute it too much.
 
 <abbr>
 is used to explain an abbreviation such as <abbr title="Linux Audio
 Developers Simple Plugin API">LADSPA</abbr>. Browsers will usually pop up the

-definition when the user hovers over the word.
+definition when the user hovers over the word. Renders as dotted underlined
+in most browsers.

 On each page, use only for the first occurrence of every abbreviation. Avoid
 a redundant explanation in the text - the expansion can easily be extracted 
 via CSS for printing.
 On each page, use only for the first occurrence of every abbreviation. Avoid
 a redundant explanation in the text - the expansion can easily be extracted 
 via CSS for printing.


@@ -179,7 +180,7 @@ Any keys or key combinations, mouse buttons or controllers, menu items or
 textual user input should be marked with this element. It is used here in
 the widest possible sense, qualified by classes.
 E.g.:
 textual user input should be marked with this element. It is used here in
 the widest possible sense, qualified by classes.
 E.g.:

-"Press <kbd>F</kbd> to fit all tracks to the height of the Editor window."
+"Press <kbd>f</kbd> to fit all tracks to the height of the Editor window."

 "Move <kbd>Fader 1</kbd> on your MIDI controller to bind it.
 "
 Since modifier keys are not cross-platform and Ardour makes a point of 
 "Move <kbd>Fader 1</kbd> on your MIDI controller to bind it.
 "
 Since modifier keys are not cross-platform and Ardour makes a point of 


@@ -187,16 +188,15 @@ abstracting them, do not hard-code "Alt", "Cmd" and friends, use
        class="modN" 
 instead.
 So if you want the user to press Ctrl-N on Linux, that's actually <kbd
        class="modN" 
 instead.
 So if you want the user to press Ctrl-N on Linux, that's actually <kbd

-class="mod1">N</kbd>. It will render as "Ctrl+N" for you, and as "Cmd+N" for
+class="mod1">N</kbd>. It will render as "Ctrl N" for you, and as "Cmd N" for

 your Mac-using friend. Nice, uh?
 
 For anything you want the user to type, use <kbd> as a block-level element.
 See above for other <kbd> classes to denote menu items, selections, mouse
 events and controller actions.
 
 your Mac-using friend. Nice, uh?
 
 For anything you want the user to type, use <kbd> as a block-level element.
 See above for other <kbd> classes to denote menu items, selections, mouse
 events and controller actions.
 

-Keys and mouse key names should always be capitalized. We do not need to
-distringuish between "x" and "X", because the latter would be "Shift-X".
-In case you forget, the stylesheet takes care of this.
+Keys and mouse key names should always be entered lowercase, even though the
+stylesheet might capitalize them.

 
 CSS Classes used with <kbd> are:
 .modN
 
 CSS Classes used with <kbd> are:
 .modN


@@ -226,7 +226,8 @@ The image tag must contain a 'src="/images/yourimage.png"' element and a
 descriptive 'alt="A short textual description of the image content"'
 element.
 Images are usually placed as block-level elements, i.e. outside of a
 descriptive 'alt="A short textual description of the image content"'
 element.
 Images are usually placed as block-level elements, i.e. outside of a

-paragraph.
+paragraph, unless they are no higher than one row and make sense in the text
+flow.

 
 5. Other conventions
 ====================
 
 5. Other conventions
 ====================


@@ -294,3 +295,12 @@ content per heading and you do not expect the article to grow.
 * If pages grow long, consider splitting them into sub-chapters at their
 headings.
 * Nobody needs "the next paragraph is about the following" paragraphs.
 * If pages grow long, consider splitting them into sub-chapters at their
 headings.
 * Nobody needs "the next paragraph is about the following" paragraphs.

+
+5.6. Encoding
+-------------
+
+* Pages should be encoded in UTF-8, with Unix-style newlines if possible
+(although that's not critical). Avoid using verbatim special symbols, use
+HTML character entities instead, for example for cursor arrows: &rarr;
+&larr; &uarr; &darr;. Diacriticals on vowels and other special letters are
+probably ok by now, so don't bother with &eacute; and friends, just type é.

diff --git a/_manual/20_default-keyboard-bindings.html b/_manual/20_default-keyboard-bindings.html
index 47d8f16ae496a79a20b5ebadbc850ba8249f582e..2f4d75e52175789661bae7164283e2164d36e2ed 100644 (file)
--- a/_manual/20_default-keyboard-bindings.html
+++ b/_manual/20_default-keyboard-bindings.html
@@ -1,27 +1,36 @@
 ---
 layout: default
 title: Default Keyboard Bindings
 ---
 layout: default
 title: Default Keyboard Bindings

+menu-title: Key Bindings

 ---                        
 
 ---                        
 

-
-  
-  
-<p>Almost every available function in Ardour can be executed via a keyboard shortcut (or OSC command). There are many more functions available than there are keys on even the largest current computer keyboards, so only a subset of them are bound to keys by default.</p>
-
-<p>Ardour comes with a rich set of default bindings. The default bindings are "mnemonic" in that they focus on trying use to
-the letter that starts the name of an operation as the binding for
-that operation. This is not always possible, but it acts as a general
-rule. This does not necessarily lead to the best ergonomics for rapid
-editing - there are alternative binding sets for that - but it does
-make it simpler for newcomers to remember some of the most common
-bindings (e.g. "s" for "Split", "p" for "position playhead").</p>
-
-<p>Almost every key binding ("shortcut") in Ardour can be changed. From the main menu choose <code>Window > Key Bindings</code>.</p>
-
-<p>The conventions for using modifier keys (Control, Alt, Command
-etc.) differ from platform to platform, so we provide different
-bindings for each platform.</p>
-  
-
+<p>
+  Almost every available function in Ardour can be bound to a keyboard
+  shortcut (and those few that cannot will usually respond to an <a
+  href="//using-control-surfaces/controlling-ardour-with-osc/"><abbr
+  title="Open Sound Control">OSC</abbr> command</a>). Ardour comes with a 
+  rich set of default <dfn>key bindings</dfn> for the most commonly used
+  functions.
+</p>
+<p>These bindings strive to be <dfn>mnemonic</dfn>, that is, easy and intuitive 
+  to remember, and follow widely accepted conventions. As a general rule, 
+  the first letter of an operation will be used for as a shortcut, if 
+  available. This does not necessarily lead to the best ergonomics for 
+  rapid editing &mdash; there are alternative binding sets for that &mdash; 
+  but it does make it simpler for newcomers to remember some of the most 
+  useful ones, for example<br />
+  <kbd>S</kbd> for <kbd class="menu">Region &gt; Edit &gt; Split"</kbd>
+  or<br />
+   <kbd>P</kbd> for <kbd class="menu">Transport &gt; Playhead &gt; Playhead to Mouse</kbd>.
+</p>
+<p>
+  Almost every key binding in Ardour can be changed in 
+  <kbd class="menu">Window &gt; Key Bindings</kbd>.
+</p>
+<p>
+  The conventions for using modifier keys (<kbd class="mod1">&nbsp;</kbd>, <kbd
+  class="mod2">&nbsp;</kbd>, <kbd class="mod3">&nbsp;</kbd> etc.) differ among platforms, so we 
+  provide different default bindings for each.
+</p>

 
 {% children %}
 
 {% children %}

diff --git a/_manual/20_default-keyboard-bindings/01_mnemonic-bindings-for-linux.html b/_manual/20_default-keyboard-bindings/01_mnemonic-bindings-for-linux.html
index 98e074c0b457e6d0c7d54c24bc5040c49dab6f18..c719ef0d315d4c80812ccc2999c3ae0d869ff44b 100644 (file)
--- a/_manual/20_default-keyboard-bindings/01_mnemonic-bindings-for-linux.html
+++ b/_manual/20_default-keyboard-bindings/01_mnemonic-bindings-for-linux.html
@@ -1,311 +1,339 @@
 ---
 layout: default
 title: Mnemonic Bindings for Linux
 ---
 layout: default
 title: Mnemonic Bindings for Linux

+menu-title: Linux

 ---                        
 
 ---                        
 

-
-  
-<p>A printable cheat-sheet with these bindings is available for download in
-<a href="/files/a3_mnemonic_cheatsheet.pdf">US Letter</a> and
-<a href="/files/a3_mnemonic_cheatsheet-a4.pdf">A4</a> paper format.
+<p>
+  A printable cheat-sheet with the mnemonic bindings for <dfn>Linux</dfn>
+  is available for download in
+  <a href="/files/a3_mnemonic_cheatsheet.pdf">US Letter</a> and
+  <a href="/files/a3_mnemonic_cheatsheet-a4.pdf">A4</a> paper format.
+</p>
+<p>
+  This set of bindings assumes an en_US keyboard. However, most if not all
+  bindings will also work on other keyboards when you use the
+  <kbd>AltGr</kbd> to compose those glyphs that are not directly accessible.

 </p>
 
 </p>
 

-<h3>Transport &amp; Recording Control</h3>
+<h2>Transport &amp; Recording Control</h2>

 <dl class="bindings">
 <dt>destroy last recording</dt>
 <dl class="bindings">
 <dt>destroy last recording</dt>

-<dd>Control+Delete</dd>
+<dd><kbd class="mod1">Del</kbd></dd>

 <dt>engage record</dt>
 <dt>engage record</dt>

-<dd>Shift+r</dd>
+<dd><kbd class="mod3">r</kbd></dd>

 <dt>fast forward</dt>
 <dt>fast forward</dt>

-<dd>Shift+→</dd>
+<dd><kbd class="mod3">&rarr;</kbd></dd>

 <dt>loop play (the loop range)</dt>
 <dt>loop play (the loop range)</dt>

-<dd>l</dd>
+<dd><kbd class="">l</kbd></dd>

 <dt>rewind</dt>
 <dt>rewind</dt>

-<dd>Shift+←</dd>
+<dd><kbd class="mod3">&larr;</kbd></dd>

 <dt>set playhead position</dt>
 <dt>set playhead position</dt>

-<dd>p</dd>
+<dd><kbd class="">p</kbd></dd>

 <dt>start recording</dt>
 <dt>start recording</dt>

-<dd>Shift+space</dd>
+<dd><kbd class="mod3">Space</kbd></dd>

 <dt>stop (keep loop/range play)</dt>
 <dt>stop (keep loop/range play)</dt>

-<dd>Control+Alt+space</dd>
+<dd><kbd class="mod12">Space</kbd></dd>

 <dt>stop and destroy</dt>
 <dt>stop and destroy</dt>

-<dd>Control+space</dd>
+<dd><kbd class="mod1">Space</kbd></dd>

 <dt>toggle auto play</dt>
 <dt>toggle auto play</dt>

-<dd>5</dd>
+<dd><kbd class="">5</kbd></dd>

 <dt>toggle auto return</dt>
 <dt>toggle auto return</dt>

-<dd>6</dd>
+<dd><kbd class="">6</kbd></dd>

 <dt>toggle click (metronome)</dt>
 <dt>toggle click (metronome)</dt>

-<dd>7</dd>
+<dd><kbd class="">7</kbd></dd>

 <dt>toggle playhead follows edits</dt>
 <dt>toggle playhead follows edits</dt>

-<dd>Shift+f</dd>
+<dd><kbd class=mod3">F</kbd></dd>

 <dt>toggle playhead tracking</dt>
 <dt>toggle playhead tracking</dt>

-<dd>Control+f</dd>
+<dd><kbd class="mod1">F</kbd></dd>

 <dt>toggle roll</dt>
 <dt>toggle roll</dt>

-<dd>space</dd>
-<dt>toggle track rec-enable </dt>
-<dd>Shift+b</dd>
-<dt>toggle track solo status</dt>
-<dd>Alt+s</dd>
+<dd><kbd class="">Space</kbd></dd>
+<dt>toggle selected track rec-enable </dt>
+<dd><kbd class="mod3">b</kbd></dd>
+<dt>toggle selected track solo status</dt>
+<dd><kbd class="mod2">s</kbd></dd>

 <dt>transition to reverse</dt>
 <dt>transition to reverse</dt>

-<dd>Shift+↓</dd>
+<dd><kbd class="mod3">&darr;</kbd></dd>

 <dt>transition to roll</dt>
 <dt>transition to roll</dt>

-<dd>Shift+↑</dd>
+<dd><kbd class="mod3">&uarr;</kbd></dd>

 </dl>
 </dl>

-<h3>Session &amp; File Handling</h3>
+
+<h2>Session &amp; File Handling</h2>

 <dl class="bindings">
 <dt>add track(s) or bus(ses)</dt>
 <dl class="bindings">
 <dt>add track(s) or bus(ses)</dt>

-<dd>Control+Shift+n</dd>
+<dd><kbd class="mod13">n</kbd></dd>

 <dt>export session</dt>
 <dt>export session</dt>

-<dd>Win+e</dd>
+<dd><kbd class="mod4">e</kbd></dd>

 <dt>import audio files</dt>
 <dt>import audio files</dt>

-<dd>Control+i</dd>
+<dd><kbd class="mod1">i</kbd></dd>

 <dt>open a new session</dt>
 <dt>open a new session</dt>

-<dd>Control+n</dd>
+<dd><kbd class="mod1">n</kbd></dd>

 <dt>open a recent session</dt>
 <dt>open a recent session</dt>

-<dd>Control+Shift+o</dd>
+<dd><kbd class="mod13">o</kbd></dd>

 <dt>open an existing session</dt>
 <dt>open an existing session</dt>

-<dd>Control+o</dd>
+<dd><kbd class="mod1">o</kbd></dd>

 <dt>quit</dt>
 <dt>quit</dt>

-<dd>Control+q</dd>
+<dd><kbd class="mod1">q</kbd></dd>

 <dt>save session</dt>
 <dt>save session</dt>

-<dd>Control+s</dd>
+<dd><kbd class="mod1">s</kbd></dd>

 <dt>snapshot session</dt>
 <dt>snapshot session</dt>

-<dd>Control+Shift+s</dd>
-<dt>toggle sel. track MIDI input</dt>
-<dd>Alt+i</dd>
+<dd><kbd class="mod13">s</kbd></dd>
+<dt>toggle selected track MIDI input</dt>
+<dd><kbd class="mod2">i</kbd></dd>

 </dl>
 </dl>

-<h3>Changing What's Visible</h3>
+
+<h2>Changing What's Visible</h2>

 <dl class="bindings">
 <dt>fit tracks vertically</dt>
 <dl class="bindings">
 <dt>fit tracks vertically</dt>

-<dd>f</dd>
+<dd><kbd class="">f</kbd></dd>

 <dt>move selected tracks down</dt>
 <dt>move selected tracks down</dt>

-<dd>Control+↓</dd>
+<dd><kbd class="mod1">&darr;</kbd></dd>

 <dt>move selected tracks up</dt>
 <dt>move selected tracks up</dt>

-<dd>Control+↑</dd>
+<dd><kbd class="mod1">&uarr;</kbd></dd>

 <dt>scroll down (page)</dt>
 <dt>scroll down (page)</dt>

-<dd>PageDown</dd>
+<dd><kbd class="">PgDn</kbd></dd>

 <dt>scroll down (step)</dt>
 <dt>scroll down (step)</dt>

-<dd>↓</dd>
+<dd><kbd class="">&darr;</kbd></dd>

 <dt>scroll up (page)</dt>
 <dt>scroll up (page)</dt>

-<dd>PageUp</dd>
+<dd><kbd class="">PgUp</kbd></dd>

 <dt>scroll up (step)</dt>
 <dt>scroll up (step)</dt>

-<dd>↑</dd>
+<dd><kbd class="">&uarr;</kbd></dd>

 <dt>toggle editor window mixer</dt>
 <dt>toggle editor window mixer</dt>

-<dd>Shift+e</dd>
-<dt>toggle last 2 zoom states</dt>
-<dd>Shift+z</dd>
-<dt>zoom (x) to selected region(s)</dt>
-<dd>Control+Alt+z</dd>
-<dt>zoom (x+y) to selected region</dt>
-<dd>Alt+z</dd>
+<dd><kbd class="mod3">e</kbd></dd>
+<dt>visual undo</dt>
+<dd><kbd class="mod3">z</kbd></dd>
+<dt>zoom height to selected region(s)</dt>
+<dd><kbd class="mod12">z</kbd></dd>
+<dt>zoom height and time to selected region</dt>
+<dd><kbd class="mod2">z</kbd></dd>

 <dt>zoom in</dt>
 <dt>zoom in</dt>

-<dd>=</dd>
+<dd><kbd class="">=</kbd></dd>

 <dt>zoom out</dt>
 <dt>zoom out</dt>

-<dd>-</dd>
+<dd><kbd class="">-</kbd></dd>

 </dl>
 </dl>

-<h3>Window Visibility</h3>
+
+<h2>Window Visibility</h2>

 <dl class="bindings">
 <dl class="bindings">

-<dt> toggle locations dialog</dt>
-<dd>Alt+l</dd>
+<dt>toggle locations dialog</dt>
+<dd><kbd class="mod2">l</kbd>(ell)</dd>

 <dt>focus on main clock</dt>
 <dt>focus on main clock</dt>

-<dd>KP_Divide</dd>
+<dd><kbd class="kp">&divide;</kbd></dd>

 <dt>maximise editor space</dt>
 <dt>maximise editor space</dt>

-<dd>Control+Alt+f</dd>
-<dt>rotate editor &amp; mixer window</dt>
-<dd>Alt+m</dd>
+<dd><kbd class="mod12">f</kbd></dd>
+<dt>switch between editor &amp; mixer window</dt>
+<dd><kbd class="mod2">m</kbd></dd>

 <dt>show rhythm ferret window </dt>
 <dt>show rhythm ferret window </dt>

-<dd>Alt+f</dd>
+<dd><kbd class="mod2">f</kbd></dd>

 <dt>toggle big clock</dt>
 <dt>toggle big clock</dt>

-<dd>Alt+b</dd>
+<dd><kbd class="mod2">b</kbd></dd>

 <dt>toggle color manager</dt>
 <dt>toggle color manager</dt>

-<dd>Alt+c</dd>
+<dd><kbd class="mod2">c</kbd></dd>

 <dt>toggle editor window</dt>
 <dt>toggle editor window</dt>

-<dd>Alt+e</dd>
+<dd><kbd class="mod2">e</kbd></dd>

 <dt>toggle global audio patchbay</dt>
 <dt>toggle global audio patchbay</dt>

-<dd>Alt+p</dd>
+<dd><kbd class="mod2">p</kbd></dd>

 <dt>toggle global midi patchbay</dt>
 <dt>toggle global midi patchbay</dt>

-<dd>Alt+Shift+p</dd>
+<dd><kbd class="mod23">p</kbd></dd>

 <dt>toggle key bindings editor</dt>
 <dt>toggle key bindings editor</dt>

-<dd>Alt+k</dd>
+<dd><kbd class="mod2">k</kbd></dd>

 <dt>toggle preferences dialog</dt>
 <dt>toggle preferences dialog</dt>

-<dd>Alt+o</dd>
+<dd><kbd class="mod2">o</kbd></dd>

 <dt>toggle preferences dialog</dt>
 <dt>toggle preferences dialog</dt>

-<dd>Control+Shift+p</dd>
+<dd><kbd class="mod13">p</kbd></dd>

 </dl>
 </dl>

-<h3>Editing with Edit Point</h3>
-<p>Most edit functions operate on a single "Edit Point". The edit point can be any of: playhead (default), the mouse or an active marker. The choice of Edit Point (by default) also sets the Zoom Focus.</p>
+
+<h2>Editing with Edit Point</h2>
+<p>
+  Most edit functions operate on a single <dfn>Edit Point</dfn> (EP). The edit 
+  point can be any of: playhead (default), the mouse or an active marker. 
+  The choice of edit point (by default) also sets the <dfn>Zoom Focus</dfn>.
+</p>
+

 <dl class="bindings">
 <dt>EP to next region sync</dt>
 <dl class="bindings">
 <dt>EP to next region sync</dt>

-<dd>;</dd>
+<dd><kbd class="">;</kbd></dd>

 <dt>EP to prev region sync</dt>
 <dt>EP to prev region sync</dt>

-<dd>'</dd>
+<dd><kbd class="">'</kbd></dd>

 <dt>cycle to next grid snap mode</dt>
 <dt>cycle to next grid snap mode</dt>

-<dd>2</dd>
+<dd><kbd class="">2</kbd></dd>

 <dt>cycle to next zoom focus</dt>
 <dt>cycle to next zoom focus</dt>

-<dd>1</dd>
+<dd><kbd class="">1</kbd></dd>

 <dt>insert from region list</dt>
 <dt>insert from region list</dt>

-<dd>i</dd>
+<dd><kbd class="">i</kbd></dd>

 <dt>insert time</dt>
 <dt>insert time</dt>

-<dd>Control+t</dd>
+<dd><kbd class="mod1">t</kbd></dd>

 <dt>move EP to playhead</dt>
 <dt>move EP to playhead</dt>

-<dd>Alt+Return</dd>
+<dd><kbd class="mod2">&crarr;</kbd></dd>

 <dt>next EP w/marker</dt>
 <dt>next EP w/marker</dt>

-<dd>Control+`</dd>
+<dd><kbd class="mod1">`</kbd></dd>

 <dt>next EP w/o marker</dt>
 <dt>next EP w/o marker</dt>

-<dd>`</dd>
+<dd><kbd class="">`</kbd></dd>

 <dt>trim back</dt>
 <dt>trim back</dt>

-<dd>k</dd>
+<dd><kbd class="">k</kbd></dd>

 <dt>trim front</dt>
 <dt>trim front</dt>

-<dd>j</dd>
+<dd><kbd class="">j</kbd></dd>

 <dt>trim region end to edit point</dt>
 <dt>trim region end to edit point</dt>

-<dd>Shift+}</dd>
+<dd><kbd class="mod3">}</kbd></dd>

 <dt>trim region start to edit point</dt>
 <dt>trim region start to edit point</dt>

-<dd>Shift+{</dd>
+<dd><kbd class="mod3">{</kbd></dd>

 <dt>trim region to end of prev region</dt>
 <dt>trim region to end of prev region</dt>

-<dd>Control+j</dd>
+<dd><kbd class="mod1">j</kbd></dd>

 <dt>trim region to start of next region</dt>
 <dt>trim region to start of next region</dt>

-<dd>Control+k</dd>
-<dt>use next grid unit</dt>
-<dd>3</dd>
+<dd><kbd class="mod1">k</kbd></dd>
+<dt>use previous grid unit</dt>
+<dd><kbd class="">3</kbd></dd>

 <dt>use next grid unit</dt>
 <dt>use next grid unit</dt>

-<dd>4</dd>
-<dt>use next musical grid unit</dt>
-<dd>Control+4</dd>
+<dd><kbd class="">4</kbd></dd>

 <dt>use previous grid unit</dt>
 <dt>use previous grid unit</dt>

-<dd>Control+3</dd>
+<dd><kbd class="mod1">3</kbd></dd>
+<dt>use next musical grid unit</dt>
+<dd><kbd class="mod1">4</kbd></dd>

 </dl>
 </dl>

-<h3>Aligning with the Edit Point</h3>
-<p>Align operations move regions so that their start/end/sync point is at the edit point. "Relative" operations
-just align the first region and moves other selected regions to maintain relative positioning.</p>
+
+<h2>Aligning with the Edit Point</h2>
+<p>
+  <dfn>Align operations</dfn> move regions so that their start/end/sync 
+  point is at the edit point. <dfn>Relative</dfn> operations just align the first 
+  region and moves other selected regions to maintain relative positioning.
+</p>
+

 <dl class="bindings">
 <dt>align end(s)</dt>
 <dl class="bindings">
 <dt>align end(s)</dt>

-<dd>Alt+a</dd>
+<dd><kbd class="mod2">a</kbd></dd>

 <dt>align start(s)</dt>
 <dt>align start(s)</dt>

-<dd>Control+Win+a</dd>
+<dd><kbd class="mod14">a</kbd></dd>

 <dt>align start(s) relative</dt>
 <dt>align start(s) relative</dt>

-<dd>Win+a</dd>
+<dd><kbd class="mod4">a</kbd></dd>

 <dt>align sync points</dt>
 <dt>align sync points</dt>

-<dd>Shift+a</dd>
+<dd><kbd class="mod3">a</kbd></dd>

 <dt>align sync points (relative)</dt>
 <dt>align sync points (relative)</dt>

-<dd>a</dd>
+<dd><kbd class="">a</kbd></dd>

 <dt>range end to next prev edge</dt>
 <dt>range end to next prev edge</dt>

-<dd>Control+&gt;</dd>
+<dd><kbd class="mod1">&gt;</kbd></dd>

 <dt>range end to next region edge</dt>
 <dt>range end to next region edge</dt>

-<dd>&gt;</dd>
+<dd><kbd class="">&gt;</kbd></dd>

 <dt>range start to next region edge</dt>
 <dt>range start to next region edge</dt>

-<dd>Control+&lt;</dd>
+<dd><kbd class="mod1">&lt;</kbd></dd>

 <dt>range start to prev region edge</dt>
 <dt>range start to prev region edge</dt>

-<dd>&lt;</dd>
+<dd><kbd class="">&lt;</kbd></dd>

 </dl>
 </dl>

-<h3>Edit Point Playback</h3>
+
+<h2>Edit Point Playback</h2>

 <dl class="bindings">
 <dt>play edit range</dt>
 <dl class="bindings">
 <dt>play edit range</dt>

-<dd>Alt+space</dd>
+<dd><kbd class="mod2">Space</kbd></dd>

 <dt>play from EP &amp; return</dt>
 <dt>play from EP &amp; return</dt>

-<dd>Win+space</dd>
+<dd><kbd class="mod4">Space</kbd></dd>

 <dt>play selected region(s)</dt>
 <dt>play selected region(s)</dt>

-<dd>h</dd>
+<dd><kbd class="">h</kbd></dd>

 </dl>
 </dl>

-<h3>Region Operations</h3>
+<h2>Region Operations</h2>

 <dl class="bindings">
 <dt>duplicate region (multi)</dt>
 <dl class="bindings">
 <dt>duplicate region (multi)</dt>

-<dd>Shift+d</dd>
+<dd><kbd class="mod3">d</kbd></dd>

 <dt>duplicate region (once)</dt>
 <dt>duplicate region (once)</dt>

-<dd>Alt+d</dd>
+<dd><kbd class="mod2">d</kbd></dd>

 <dt>export selected region(s)</dt>
 <dt>export selected region(s)</dt>

-<dd>Control+Win+e</dd>
+<dd><kbd class="mod14">e</kbd></dd>

 <dt>increase region gain</dt>
 <dt>increase region gain</dt>

-<dd>^</dd>
+<dd><kbd class="">^</kbd></dd>

 <dt>move to original position</dt>
 <dt>move to original position</dt>

-<dd>Alt+o</dd>
+<dd><kbd class="mod2">o</kbd></dd>

 <dt>mute/unmute</dt>
 <dt>mute/unmute</dt>

-<dd>Control+m</dd>
+<dd><kbd class="mod1">m</kbd></dd>

 <dt>normalize</dt>
 <dt>normalize</dt>

-<dd>n</dd>
+<dd><kbd class="">n</kbd></dd>

 <dt>nudge backward</dt>
 <dt>nudge backward</dt>

-<dd>KP_Subtract</dd>
+<dd><kbd class="kp">&ndash;</kbd></dd>

 <dt>nudge forward</dt>
 <dt>nudge forward</dt>

-<dd>KP_Add</dd>
+<dd><kbd class="kp">+</kbd></dd>

 <dt>quantize MIDI notes </dt>
 <dt>quantize MIDI notes </dt>

-<dd>q</dd>
+<dd><kbd class="">q</kbd></dd>

 <dt>reduce region gain</dt>
 <dt>reduce region gain</dt>

-<dd>&amp;</dd>
+<dd><kbd class="">&amp;</kbd></dd>

 <dt>reverse</dt>
 <dt>reverse</dt>

-<dd>Alt+r</dd>
+<dd><kbd class="mod2">r</kbd></dd>

 <dt>set fade in length</dt>
 <dt>set fade in length</dt>

-<dd>/</dd>
+<dd><kbd class="">/</kbd></dd>

 <dt>set fade out length</dt>
 <dt>set fade out length</dt>

-<dd>\</dd>
+<dd><kbd class="">\</kbd></dd>

 <dt>set region sync point</dt>
 <dt>set region sync point</dt>

-<dd>v</dd>
+<dd><kbd class="">v</kbd></dd>

 <dt>split</dt>
 <dt>split</dt>

-<dd>s</dd>
+<dd><kbd class="">s</kbd></dd>

 <dt>toggle fade in active</dt>
 <dt>toggle fade in active</dt>

-<dd>Control+/</dd>
+<dd><kbd class="mod1">/</kbd></dd>

 <dt>toggle fade out active</dt>
 <dt>toggle fade out active</dt>

-<dd>Control+\</dd>
+<dd><kbd class="mod1">\</kbd></dd>

 <dt>transpose</dt>
 <dt>transpose</dt>

-<dd>Alt+t</dd>
+<dd><kbd class="mod2">t</kbd></dd>

 </dl>
 </dl>

-<h3>Edit Range</h3>
-<p>There are only a few functions that refer to an "Edit Range". The current edit range is defined using combinations of the possible edit points: Playhead, Marker or Mouse.</p>
+
+<h2>Generic Editing</h2>

 <dl class="bindings">
 <dt>copy</dt>
 <dl class="bindings">
 <dt>copy</dt>

-<dd>Control+c</dd>
+<dd><kbd class="mod1">c</kbd></dd>

 <dt>cut</dt>
 <dt>cut</dt>

-<dd>Control+x</dd>
+<dd><kbd class="mod1">x</kbd></dd>

 <dt>delete</dt>
 <dt>delete</dt>

-<dd>Delete</dd>
+<dd><kbd class="">Del</kbd></dd>

 <dt>paste</dt>
 <dt>paste</dt>

-<dd>Control+v</dd>
+<dd><kbd class="mod1">v</kbd></dd>

 <dt>redo</dt>
 <dt>redo</dt>

-<dd>Control+r</dd>
+<dd><kbd class="mod1">r</kbd></dd>

 <dt>undo</dt>
 <dt>undo</dt>

-<dd>Control+z</dd>
+<dd><kbd class="mod1">z</kbd></dd>

 </dl>
 </dl>

-<h3>Selecting</h3>
+
+<h2>Selecting</h2>
+<p class="note">
+  There are  a few functions that refer to an <dfn>Edit Range</dfn>. The 
+  current edit range is defined using combinations of the possible edit 
+  points: <dfn>playhead</dfn>, <dfn>active marker</dfn>, or <dfn>mouse</dfn>.
+</p>
+

 <dl class="bindings">
 <dt>all after playhead</dt>
 <dl class="bindings">
 <dt>all after playhead</dt>

-<dd>Shift+Control+p</dd>
+<dd><kbd class="mod13">p</kbd></dd>

 <dt>all before playhead</dt>
 <dt>all before playhead</dt>

-<dd>Control+p</dd>
+<dd><kbd class="mod1">p</kbd></dd>

 <dt>all enclosed by edit range</dt>
 <dt>all enclosed by edit range</dt>

-<dd>Control+u</dd>
+<dd><kbd class="mod1">u</kbd></dd>

 <dt>all present in edit range</dt>
 <dt>all present in edit range</dt>

-<dd>u</dd>
+<dd><kbd class="">u</kbd></dd>

 <dt>convert edit range to range</dt>
 <dt>convert edit range to range</dt>

-<dd>F6</dd>
+<dd><kbd class="">F6</kbd></dd>

 <dt>invert selection</dt>
 <dt>invert selection</dt>

-<dd>Shift+i</dd>
+<dd><kbd class="mod3">i</kbd></dd>

 <dt>select all after EP</dt>
 <dt>select all after EP</dt>

-<dd>Control+Shift+e</dd>
+<dd><kbd class="mod13">e</kbd></dd>

 <dt>select all before EP</dt>
 <dt>select all before EP</dt>

-<dd>Control+e</dd>
+<dd><kbd class="mod1">e</kbd></dd>

 <dt>select all in loop range</dt>
 <dt>select all in loop range</dt>

-<dd>Control+l</dd>
+<dd><kbd class="mod1">l</kbd></dd>

 <dt>select all in punch range</dt>
 <dt>select all in punch range</dt>

-<dd>Control+d</dd>
+<dd><kbd class="mod1">d</kbd></dd>

 <dt>select everything</dt>
 <dt>select everything</dt>

-<dd>Control+a</dd>
+<dd><kbd class="mod1">a</kbd></dd>

 <dt>select next track/bus</dt>
 <dt>select next track/bus</dt>

-<dd>Alt+↓</dd>
+<dd><kbd class="mod2">&darr;</kbd></dd>

 <dt>select previous track/bus</dt>
 <dt>select previous track/bus</dt>

-<dd>Alt+↑</dd>
+<dd><kbd class="mod2">&uarr;</kbd></dd>

 </dl>
 </dl>

-<h3>Defining Loop, Punch Range and Tempo Changes</h3>
+
+<h2>Defining Loop, Punch Range and Tempo Changes</h2>

 <dl class="bindings">
 <dt>set loop range from edit range</dt>
 <dl class="bindings">
 <dt>set loop range from edit range</dt>

-<dd>]</dd>
+<dd><kbd class="">]</kbd></dd>

 <dt>set loop range from region(s)</dt>
 <dt>set loop range from region(s)</dt>

-<dd>Alt+]</dd>
+<dd><kbd class="mod2">]</kbd></dd>

 <dt>set punch range from edit range</dt>
 <dt>set punch range from edit range</dt>

-<dd>[</dd>
+<dd><kbd class="">[</kbd></dd>

 <dt>set punch range from region(s)</dt>
 <dt>set punch range from region(s)</dt>

-<dd>Alt+[</dd>
+<dd><kbd class="mod2">[</kbd></dd>

 <dt>set tempo (1 bar) from edit range</dt>
 <dt>set tempo (1 bar) from edit range</dt>

-<dd>0</dd>
+<dd><kbd class="">0</kbd></dd>

 <dt>set tempo (1 bar) from region(s)</dt>
 <dt>set tempo (1 bar) from region(s)</dt>

-<dd>9</dd>
+<dd><kbd class="">9</kbd></dd>

 </dl>
 </dl>

-<p>  </p>
-<!-- remove this if more text is added below --><!-- remove this if more text is added below -->  
+

diff --git a/_manual/20_default-keyboard-bindings/02_mnemonic-bindings-for-os-x.html b/_manual/20_default-keyboard-bindings/02_mnemonic-bindings-for-os-x.html
index cb6f2b9c5031b2ba5fa8940cd909567eb85dd3df..43d5df3fe9669ffbfb105e166dc77d11633c41bc 100644 (file)
--- a/_manual/20_default-keyboard-bindings/02_mnemonic-bindings-for-os-x.html
+++ b/_manual/20_default-keyboard-bindings/02_mnemonic-bindings-for-os-x.html
@@ -2,307 +2,331 @@
 layout: default
 title: Mnemonic Bindings for OS X
 ---                        
 layout: default
 title: Mnemonic Bindings for OS X
 ---                        

-
-
-  

   
   

-<p>A <a href="/files/a3_mnemonic_cheat_sheet_osx.pdf">printable cheat sheet</a> for these bindings is available for download.</p>
-<h3>Transport &amp; Recording Control</h3>
+<p>
+  A <a href="/files/a3_mnemonic_cheat_sheet_osx.pdf">printable cheat sheet</a> 
+  for these bindings is available for download.
+</p>
+
+<h2>Transport &amp; Recording Control</h2>

 <dl class="bindings">
 <dt>destroy last recording</dt>
 <dl class="bindings">
 <dt>destroy last recording</dt>

-<dd>Cmd+Delete</dd>
+<dd><kbd class="mod1">Del</kbd></dd>

 <dt>engage record</dt>
 <dt>engage record</dt>

-<dd>Shift+r</dd>
+<dd><kbd class="mod3">r</kbd></dd>

 <dt>fast forward</dt>
 <dt>fast forward</dt>

-<dd>Shift+→</dd>
+<dd><kbd class="mod3">→</kbd></dd>

 <dt>loop play (the loop range)</dt>
 <dt>loop play (the loop range)</dt>

-<dd>l</dd>
+<dd><kbd class="">l</kbd></dd>

 <dt>rewind</dt>
 <dt>rewind</dt>

-<dd>Shift+←</dd>
+<dd><kbd class="mod3">&larr;</kbd></dd>

 <dt>set playhead position</dt>
 <dt>set playhead position</dt>

-<dd>p</dd>
+<dd><kbd class="">p</kbd></dd>

 <dt>start recording</dt>
 <dt>start recording</dt>

-<dd>Shift+space</dd>
+<dd><kbd class="mod3">space</kbd></dd>

 <dt>stop (keep loop/range play)</dt>
 <dt>stop (keep loop/range play)</dt>

-<dd>Cmd+Control+space</dd>
+<dd><kbd class="mod12">space</kbd></dd>

 <dt>stop and destroy</dt>
 <dt>stop and destroy</dt>

-<dd>Cmd+space</dd>
+<dd><kbd class="mod1">space</kbd></dd>

 <dt>toggle auto play</dt>
 <dt>toggle auto play</dt>

-<dd>5</dd>
+<dd>5</kbd></dd>

 <dt>toggle auto return</dt>
 <dt>toggle auto return</dt>

-<dd>6</dd>
+<dd>6</kbd></dd>

 <dt>toggle click (metronome)</dt>
 <dt>toggle click (metronome)</dt>

-<dd>7</dd>
+<dd>7</kbd></dd>

 <dt>toggle playhead follows edits</dt>
 <dt>toggle playhead follows edits</dt>

-<dd>Shift+f</dd>
+<dd><kbd class="mod3">f</kbd></dd>

 <dt>toggle playhead tracking</dt>
 <dt>toggle playhead tracking</dt>

-<dd>Cmd+f</dd>
+<dd><kbd class="mod1">f</kbd></dd>

 <dt>toggle roll</dt>
 <dt>toggle roll</dt>

-<dd>space</dd>
+<dd><kbd class="">space</kbd></dd>

 <dt>toggle track rec-enable </dt>
 <dt>toggle track rec-enable </dt>

-<dd>Shift+b</dd>
+<dd><kbd class="mod3">b</kbd></dd>

 <dt>toggle track solo status</dt>
 <dt>toggle track solo status</dt>

-<dd>Control+s</dd>
+<dd><kbd class="mod2">s</kbd></dd>

 <dt>transition to reverse</dt>
 <dt>transition to reverse</dt>

-<dd>Shift+↓</dd>
+<dd><kbd class="mod3">&darr;</kbd></dd>

 <dt>transition to roll</dt>
 <dt>transition to roll</dt>

-<dd>Shift+↑</dd>
+<dd><kbd class="mod3">&uarr;</kbd></dd>

 </dl>
 </dl>

-<h3>Session &amp; File Handling</h3>
+<h2>Session &amp; File Handling</h2>

 <dl class="bindings">
 <dt>add track(s) or bus(ses)</dt>
 <dl class="bindings">
 <dt>add track(s) or bus(ses)</dt>

-<dd>Cmd+Shift+n</dd>
+<dd><kbd class="mod13">n</kbd></dd>

 <dt>export session</dt>
 <dt>export session</dt>

-<dd>Mod1+e</dd>
+<dd><kbd class="mod1">e</kbd></dd>

 <dt>import audio files</dt>
 <dt>import audio files</dt>

-<dd>Cmd+i</dd>
+<dd><kbd class="mod1">i</kbd></dd>

 <dt>open a new session</dt>
 <dt>open a new session</dt>

-<dd>Cmd+n</dd>
+<dd><kbd class="mod1">n</kbd></dd>

 <dt>open a recent session</dt>
 <dt>open a recent session</dt>

-<dd>Cmd+Shift+o</dd>
+<dd><kbd class="mod13">o</kbd></dd>

 <dt>open an existing session</dt>
 <dt>open an existing session</dt>

-<dd>Cmd+o</dd>
+<dd><kbd class="mod1">o</kbd></dd>

 <dt>quit</dt>
 <dt>quit</dt>

-<dd>Cmd+q</dd>
+<dd><kbd class="mod1">q</kbd></dd>

 <dt>save session</dt>
 <dt>save session</dt>

-<dd>Cmd+s</dd>
+<dd><kbd class="mod1">s</kbd></dd>

 <dt>snapshot session</dt>
 <dt>snapshot session</dt>

-<dd>Cmd+Shift+s</dd>
+<dd><kbd class="mod13">s</kbd></dd>

 <dt>toggle sel. track MIDI input</dt>
 <dt>toggle sel. track MIDI input</dt>

-<dd>Control+i</dd>
+<dd><kbd class="mod2">i</kbd></dd>

 </dl>
 </dl>

-<h3>Changing What's Visible</h3>
+<h2>Changing What's Visible</h2>

 <dl class="bindings">
 <dt>fit tracks vertically</dt>
 <dl class="bindings">
 <dt>fit tracks vertically</dt>

-<dd>f</dd>
+<dd><kbd class="">f</kbd></dd>

 <dt>move selected tracks down</dt>
 <dt>move selected tracks down</dt>

-<dd>Cmd+↓</dd>
+<dd><kbd class="mod1">&darr;</kbd></dd>

 <dt>move selected tracks up</dt>
 <dt>move selected tracks up</dt>

-<dd>Cmd+↑</dd>
+<dd><kbd class="mod1">&uarr;</kbd></dd>

 <dt>scroll down (page)</dt>
 <dt>scroll down (page)</dt>

-<dd>PageDown</dd>
+<dd><kbd class="">PgDn</kbd></dd>

 <dt>scroll down (step)</dt>
 <dt>scroll down (step)</dt>

-<dd>↓</dd>
+<dd><kbd class="">&darr;</kbd></dd>

 <dt>scroll up (page)</dt>
 <dt>scroll up (page)</dt>

-<dd>PageUp</dd>
+<dd><kbd class="">PageUp</kbd></dd>

 <dt>scroll up (step)</dt>
 <dt>scroll up (step)</dt>

-<dd>↑</dd>
+<dd><kbd class="">&uarr;</kbd></dd>

 <dt>toggle editor window mixer</dt>
 <dt>toggle editor window mixer</dt>

-<dd>Shift+e</dd>
+<dd><kbd class="mod3">e</kbd></dd>

 <dt>toggle last 2 zoom states</dt>
 <dt>toggle last 2 zoom states</dt>

-<dd>Shift+z</dd>
-<dt>zoom (x) to selected region(s)</dt>
-<dd>Cmd+Control+z</dd>
-<dt>zoom (x+y) to selected region</dt>
-<dd>Control+z</dd>
+<dd><kbd class="mod3">z</kbd></dd>
+<dt>zoom height to selected region(s)</dt>
+<dd><kbd class="mod1">Control+z</kbd></dd>
+<dt>zoom height and time to selected region</dt>
+<dd><kbd class="mod2">z</kbd></dd>

 <dt>zoom in</dt>
 <dt>zoom in</dt>

-<dd>=</dd>
+<dd>=</kbd></dd>

 <dt>zoom out</dt>
 <dt>zoom out</dt>

-<dd>-</dd>
+<dd>-</kbd></dd>

 </dl>
 </dl>

-<h3>Window Visibility</h3>
+<h2>Window Visibility</h2>

 <dl class="bindings">
 <dl class="bindings">

-<dt> toggle locations dialog</dt>
-<dd>Control+l</dd>
+<dt>toggle locations dialog</dt>
+<dd><kbd class="mod2">l</kbd></dd>

 <dt>focus on main clock</dt>
 <dt>focus on main clock</dt>

-<dd>KP_Divide</dd>
+<dd><kbd class="kp">&divide;</kbd></dd>

 <dt>maximise editor space</dt>
 <dt>maximise editor space</dt>

-<dd>Cmd+Control+f</dd>
+<dd><kbd class="mod12">f</kbd></dd>

 <dt>rotate editor &amp; mixer window</dt>
 <dt>rotate editor &amp; mixer window</dt>

-<dd>Control+m</dd>
+<dd><kbd class="mod2">m</kbd></dd>

 <dt>show rhythm ferret window </dt>
 <dt>show rhythm ferret window </dt>

-<dd>Control+f</dd>
+<dd><kbd class="mod2">f</kbd></dd>

 <dt>toggle big clock</dt>
 <dt>toggle big clock</dt>

-<dd>Control+b</dd>
+<dd><kbd class="mod2">b</kbd></dd>

 <dt>toggle color manager</dt>
 <dt>toggle color manager</dt>

-<dd>Control+c</dd>
+<dd><kbd class="mod2">c</kbd></dd>

 <dt>toggle editor window</dt>
 <dt>toggle editor window</dt>

-<dd>Control+e</dd>
+<dd><kbd class="mod2">e</kbd></dd>

 <dt>toggle global audio patchbay</dt>
 <dt>toggle global audio patchbay</dt>

-<dd>Control+p</dd>
+<dd><kbd class="mod2">p</kbd></dd>

 <dt>toggle global midi patchbay</dt>
 <dt>toggle global midi patchbay</dt>

-<dd>Control+Shift+p</dd>
+<dd><kbd class="mod23">p</kbd></dd>

 <dt>toggle key bindings editor</dt>
 <dt>toggle key bindings editor</dt>

-<dd>Control+k</dd>
+<dd><kbd class="mod2">k</kbd></dd>

 <dt>toggle preferences dialog</dt>
 <dt>toggle preferences dialog</dt>

-<dd>Control+o</dd>
+<dd><kbd class="mod2">o</kbd></dd>

 <dt>toggle preferences dialog</dt>
 <dt>toggle preferences dialog</dt>

-<dd>Cmd+Shift+p</dd>
+<dd><kbd class="mod13">p</kbd></dd>

 </dl>
 </dl>

-<h3>Editing with Edit Point</h3>
-<p>Most edit functions operate on a single "Edit Point". The edit point can be any of: playhead (default), the mouse or an active marker. The choice of Edit Point (by default) also sets the Zoom Focus.</p>
+
+<h2>Editing with Edit Point</h2>
+<p>
+  Most edit functions operate on a single <dfn>Edit Point</dfn> (EP). The
+  edit 
+  point can be any of: playhead (default), the mouse or an active marker. 
+  The choice of edit point (by default) also sets the <dfn>Zoom Focus</dfn>.
+</p>
+

 <dl class="bindings">
 <dt>EP to next region sync</dt>
 <dl class="bindings">
 <dt>EP to next region sync</dt>

-<dd>;</dd>
+<dd><kbd class="">;</kbd></dd>

 <dt>EP to prev region sync</dt>
 <dt>EP to prev region sync</dt>

-<dd>'</dd>
+<dd><kbd class="">'</kbd></dd>

 <dt>cycle to next grid snap mode</dt>
 <dt>cycle to next grid snap mode</dt>

-<dd>2</dd>
+<dd><kbd class="">2</kbd></dd>

 <dt>cycle to next zoom focus</dt>
 <dt>cycle to next zoom focus</dt>

-<dd>1</dd>
+<dd><kbd class="">1</kbd></dd>

 <dt>insert from region list</dt>
 <dt>insert from region list</dt>

-<dd>i</dd>
+<dd><kbd class="">i</kbd></dd>

 <dt>insert time</dt>
 <dt>insert time</dt>

-<dd>Cmd+t</dd>
+<dd><kbd class="mod1">t</kbd></dd>

 <dt>move EP to playhead</dt>
 <dt>move EP to playhead</dt>

-<dd>Control+Return</dd>
+<dd><kbd class="mod2">Return</kbd></dd>

 <dt>next EP w/marker</dt>
 <dt>next EP w/marker</dt>

-<dd>Cmd+^</dd>
+<dd><kbd class="mod1">^</kbd></dd>

 <dt>next EP w/o marker</dt>
 <dt>next EP w/o marker</dt>

-<dd>`</dd>
+<dd><kbd class="">`</kbd></dd>

 <dt>trim back</dt>
 <dt>trim back</dt>

-<dd>k</dd>
+<dd><kbd class="">k</kbd></dd>

 <dt>trim front</dt>
 <dt>trim front</dt>

-<dd>j</dd>
+<dd><kbd class="">j</kbd></dd>

 <dt>trim region end to edit point</dt>
 <dt>trim region end to edit point</dt>

-<dd>Shift+}</dd>
+<dd><kbd class="mod3">}</kbd></dd>

 <dt>trim region start to edit point</dt>
 <dt>trim region start to edit point</dt>

-<dd>Shift+{</dd>
+<dd><kbd class="mod3">{</kbd></dd>

 <dt>trim region to end of prev region</dt>
 <dt>trim region to end of prev region</dt>

-<dd>Cmd+j</dd>
+<dd><kbd class="mod1">j</kbd></dd>

 <dt>trim region to start of next region</dt>
 <dt>trim region to start of next region</dt>

-<dd>Cmd+k</dd>
-<dt>use next grid unit</dt>
-<dd>3</dd>
+<dd><kbd class="mod1">k</kbd></dd>
+<dt>use previous grid unit</dt>
+<dd><kbd class="">3</kbd></dd>

 <dt>use next grid unit</dt>
 <dt>use next grid unit</dt>

-<dd>4</dd>
-<dt>use next musical grid unit</dt>
-<dd>Cmd+4</dd>
+<dd><kbd class="">4</kbd></dd>

 <dt>use previous grid unit</dt>
 <dt>use previous grid unit</dt>

-<dd>Cmd+3</dd>
+<dd><kbd class="mod1">3</kbd></dd>
+<dt>use next musical grid unit</dt>
+<dd><kbd class="mod1">4</kbd></dd>

 </dl>
 </dl>

-<h3>Aligning with the Edit Point</h3>
-<p>Align operations move regions so that their start/end/sync point is at the edit point. "Relative" operations
-just align the first region and moves other selected regions to maintain relative positioning.</p>
+
+<h2>Aligning with the Edit Point</h2>
+<p>
+  <dfn>Align operations</dfn> move regions so that their start/end/sync 
+  point is at the edit point. <dfn>Relative</dfn> operations just align
+  the first region and moves other selected regions to maintain relative 
+  positioning.
+</p>
+

 <dl class="bindings">
 <dt>align end(s)</dt>
 <dl class="bindings">
 <dt>align end(s)</dt>

-<dd>Control+a</dd>
+<dd><kbd class="mod2">a</kbd></dd>

 <dt>align start(s)</dt>
 <dt>align start(s)</dt>

-<dd>Cmd+Mod1+a</dd>
+<dd></dd>

 <dt>align start(s) relative</dt>
 <dt>align start(s) relative</dt>

-<dd>Mod1+a</dd>
+<dd></kbd></dd>

 <dt>align sync points</dt>
 <dt>align sync points</dt>

-<dd>Shift+a</dd>
+<dd><kbd class="mod3">a</kbd></dd>

 <dt>align sync points (relative)</dt>
 <dt>align sync points (relative)</dt>

-<dd>a</dd>
+<dd><kbd class="">a</kbd></dd>

 <dt>range end to next prev edge</dt>
 <dt>range end to next prev edge</dt>

-<dd>Cmd+&gt;</dd>
+<dd><kbd class="mod1">&gt;</kbd></dd>

 <dt>range end to next region edge</dt>
 <dt>range end to next region edge</dt>

-<dd>&gt;</dd>
+<dd>&gt;</kbd></dd>

 <dt>range start to next region edge</dt>
 <dt>range start to next region edge</dt>

-<dd>Cmd+&lt;</dd>
+<dd><kbd class="mod1">&lt;</kbd></dd>

 <dt>range start to prev region edge</dt>
 <dt>range start to prev region edge</dt>

-<dd>&lt;</dd>
+<dd>&lt;</kbd></dd>

 </dl>
 </dl>

-<h3>Edit Point Playback</h3>
+
+<h2>Edit Point Playback</h2>
+

 <dl class="bindings">
 <dt>play edit range</dt>
 <dl class="bindings">
 <dt>play edit range</dt>

-<dd>Control+space</dd>
+<dd><kbd class="mod2">Space</kbd></dd>

 <dt>play from EP &amp; return</dt>
 <dt>play from EP &amp; return</dt>

-<dd>Mod1+space</dd>
+<dd><kbd class="mod1">Space</kbd></dd>

 <dt>play selected region(s)</dt>
 <dt>play selected region(s)</dt>

-<dd>h</dd>
+<dd><kbd class="">h</kbd></dd>

 </dl>
 </dl>

-<h3>Region Operations</h3>
+<h2>Region Operations</h2>

 <dl class="bindings">
 <dt>duplicate region (multi)</dt>
 <dl class="bindings">
 <dt>duplicate region (multi)</dt>

-<dd>Shift+d</dd>
+<dd><kbd class="mod3">d</kbd></dd>

 <dt>duplicate region (once)</dt>
 <dt>duplicate region (once)</dt>

-<dd>Control+d</dd>
+<dd><kbd class="mod2">d</kbd></dd>

 <dt>export selected region(s)</dt>
 <dt>export selected region(s)</dt>

-<dd>Cmd+Mod1+e</dd>
+<dd></dd>

 <dt>increase region gain</dt>
 <dt>increase region gain</dt>

-<dd>^</dd>
+<dd><kbd class="">^</kbd></dd>

 <dt>move to original position</dt>
 <dt>move to original position</dt>

-<dd>Control+o</dd>
+<dd><kbd class="mod2">o</kbd></dd>

 <dt>mute/unmute</dt>
 <dt>mute/unmute</dt>

-<dd>Cmd+m</dd>
+<dd><kbd class="mod1">m</kbd></dd>

 <dt>normalize</dt>
 <dt>normalize</dt>

-<dd>n</dd>
+<dd><kbd class="">n</kbd></dd>

 <dt>nudge backward</dt>
 <dt>nudge backward</dt>

-<dd>KP_Subtract</dd>
+<dd><kbd class="kp">&ndash;</kbd></dd>

 <dt>nudge forward</dt>
 <dt>nudge forward</dt>

-<dd>KP_Add</dd>
+<dd><kbd class="kp">+</kbd></dd>

 <dt>quantize MIDI notes </dt>
 <dt>quantize MIDI notes </dt>

-<dd>q</dd>
+<dd><kbd class="">q</kbd></dd>

 <dt>reduce region gain</dt>
 <dt>reduce region gain</dt>

-<dd>&amp;</dd>
+<dd><kbd class="">&amp;</kbd></dd>

 <dt>reverse</dt>
 <dt>reverse</dt>

-<dd>Control+r</dd>
+<dd><kbd class="mod2">r</kbd></dd>

 <dt>set fade in length</dt>
 <dt>set fade in length</dt>

-<dd>/</dd>
+<dd><kbd class="">/</kbd></dd>

 <dt>set fade out length</dt>
 <dt>set fade out length</dt>

-<dd>\</dd>
+<dd><kbd class="">\</kbd></dd>

 <dt>set region sync point</dt>
 <dt>set region sync point</dt>

-<dd>v</dd>
+<dd><kbd class="">v</kbd></dd>

 <dt>split</dt>
 <dt>split</dt>

-<dd>s</dd>
+<dd><kbd class="">s</kbd></dd>

 <dt>toggle fade in active</dt>
 <dt>toggle fade in active</dt>

-<dd>Cmd+/</dd>
+<dd><kbd class="mod1">/</kbd></dd>

 <dt>toggle fade out active</dt>
 <dt>toggle fade out active</dt>

-<dd>Cmd+\</dd>
+<dd><kbd class="mod1">\</kbd></dd>

 <dt>transpose</dt>
 <dt>transpose</dt>

-<dd>Control+t</dd>
+<dd><kbd class="mod2">t</kbd></dd>

 </dl>
 </dl>

-<h3>Edit Range</h3>
-<p>There are only a few functions that refer to an "Edit Range". The current edit range is defined using combinations of the possible edit points: Playhead, Marker or Mouse.</p>
+
+<h2>Generic Editing</h2>
+

 <dl class="bindings">
 <dt>copy</dt>
 <dl class="bindings">
 <dt>copy</dt>

-<dd>Cmd+c</dd>
+<dd><kbd class="mod1">c</kbd></dd>

 <dt>cut</dt>
 <dt>cut</dt>

-<dd>Cmd+x</dd>
+<dd><kbd class="mod1">x</kbd></dd>

 <dt>delete</dt>
 <dt>delete</dt>

-<dd>Delete</dd>
+<dd><kbd class="">Del</kbd></dd>

 <dt>paste</dt>
 <dt>paste</dt>

-<dd>Cmd+v</dd>
+<dd><kbd class="mod1">v</kbd></dd>

 <dt>redo</dt>
 <dt>redo</dt>

-<dd>Cmd+r</dd>
+<dd><kbd class="mod1">r</kbd></dd>

 <dt>undo</dt>
 <dt>undo</dt>

-<dd>Cmd+z</dd>
+<dd><kbd class="mod1">z</kbd></dd>

 </dl>
 </dl>

-<h3>Selecting</h3>
+
+<h2>Selecting</h2>
+<p class="note">
+  There are  a few functions that refer to an <dfn>Edit Range</dfn>. The 
+  current edit range is defined using combinations of the possible edit 
+  points: <dfn>playhead</dfn>, <dfn>active marker</dfn>, or<dfn>mouse</dfn>.
+</p>
+

 <dl class="bindings">
 <dt>all after playhead</dt>
 <dl class="bindings">
 <dt>all after playhead</dt>

-<dd>Shift+Cmd+p</dd>
+<dd><kbd class="mod13">p</kbd></dd>

 <dt>all before playhead</dt>
 <dt>all before playhead</dt>

-<dd>Cmd+p</dd>
+<dd><kbd class="mod1">p</kbd></dd>

 <dt>all enclosed by edit range</dt>
 <dt>all enclosed by edit range</dt>

-<dd>Cmd+u</dd>
+<dd><kbd class="mod1">u</kbd></dd>

 <dt>all present in edit range</dt>
 <dt>all present in edit range</dt>

-<dd>u</dd>
+<dd><kbd class="">u</kbd></dd>

 <dt>convert edit range to range</dt>
 <dt>convert edit range to range</dt>

-<dd>F6</dd>
+<dd><kbd class="">F6</kbd></dd>

 <dt>invert selection</dt>
 <dt>invert selection</dt>

-<dd>Shift+i</dd>
+<dd><kbd class="mod3">i</kbd></dd>

 <dt>select all after EP</dt>
 <dt>select all after EP</dt>

-<dd>Cmd+Shift+e</dd>
+<dd><kbd class="mod1">Shift+e</kbd></dd>

 <dt>select all before EP</dt>
 <dt>select all before EP</dt>

-<dd>Cmd+e</dd>
+<dd><kbd class="mod1">e</kbd></dd>

 <dt>select all in loop range</dt>
 <dt>select all in loop range</dt>

-<dd>Cmd+l</dd>
+<dd><kbd class="mod1">l</kbd></dd>

 <dt>select all in punch range</dt>
 <dt>select all in punch range</dt>

-<dd>Cmd+d</dd>
+<dd><kbd class="mod1">d</kbd></dd>

 <dt>select everything</dt>
 <dt>select everything</dt>

-<dd>Cmd+a</dd>
+<dd><kbd class="mod1">a</kbd></dd>

 <dt>select next track/bus</dt>
 <dt>select next track/bus</dt>

-<dd>Control+↓</dd>
+<dd><kbd class="mod2">↓</kbd></dd>

 <dt>select previous track/bus</dt>
 <dt>select previous track/bus</dt>

-<dd>Control+↑</dd>
+<dd><kbd class="mod2">↑</kbd></dd>

 </dl>
 </dl>

-<h3>Defining Loop, Punch Range and Tempo Changes</h3>
+<h2>Defining Loop, Punch Range and Tempo Changes</h2>

 <dl class="bindings">
 <dt>set loop range from edit range</dt>
 <dl class="bindings">
 <dt>set loop range from edit range</dt>

-<dd>]</dd>
+<dd><kbd class="">]</kbd></dd>

 <dt>set loop range from region(s)</dt>
 <dt>set loop range from region(s)</dt>

-<dd>Control+]</dd>
+<dd><kbd class="mod2">]</kbd></dd>

 <dt>set punch range from edit range</dt>
 <dt>set punch range from edit range</dt>

-<dd>[</dd>
+<dd><kbd class="">[</kbd></dd>

 <dt>set punch range from region(s)</dt>
 <dt>set punch range from region(s)</dt>

-<dd>Control+[</dd>
+<dd><kbd class="mod2">[</kbd></dd>

 <dt>set tempo (1 bar) from edit range</dt>
 <dt>set tempo (1 bar) from edit range</dt>

-<dd>0</dd>
+<dd><kbd class="">0</kbd></dd>

 <dt>set tempo (1 bar) from region(s)</dt>
 <dt>set tempo (1 bar) from region(s)</dt>

-<dd>9</dd>
+<dd><kbd class="">9</kbd></dd>

 </dl>
 </dl>

-<p>  </p>
-<!-- remove this if more text is added below --><!-- remove this if more text is added below -->  
+
+

diff --git a/source/css/app.css b/source/css/app.css
index fff165ee9b41647fd356492d31aaba4f1e027a55..38fb44b5c96f00a67769f99a3737a3b4376846e2 100644 (file)
--- a/source/css/app.css
+++ b/source/css/app.css
@@ -460,60 +460,55 @@ samp:after {
 .mod1:before {
     content: "Ctrl ";
 }
 .mod1:before {
     content: "Ctrl ";
 }

-

 .mod2:before {
     content: "Alt ";
 }
 .mod2:before {
     content: "Alt ";
 }

-

 .mod3:before {
     content: "Shift ";
 }
 .mod3:before {
     content: "Shift ";
 }

-

 .mod4:before {
     content: "Win ";
 }
 .mod4:before {
     content: "Win ";
 }

-

 .mod12:before {
     content: "Ctrl Alt ";
 }
 .mod12:before {
     content: "Ctrl Alt ";
 }

-

 .mod13:before {
     content: "Ctrl Shift ";
 }
 .mod13:before {
     content: "Ctrl Shift ";
 }

-

 .mod14:before {
     content: "Ctrl Win ";
 }
 .mod14:before {
     content: "Ctrl Win ";
 }

+.mod23:before {
+    content: "Alt Shift ";
+}
+.kp:before {
+    content: "Keypad ";
+}

 
 .mac .mod1:before {
     content: "Cmd ";
 }
 
 .mac .mod1:before {
     content: "Cmd ";
 }

-

 .mac .mod2:before {
     content: "Ctrl ";
 }
 .mac .mod2:before {
     content: "Ctrl ";
 }

-

 .mac .mod3:before {
     content: "Shift ";
 }
 .mac .mod3:before {
     content: "Shift ";
 }

-

 .mac .mod4:before {
     content: "Opt ";
 }
 .mac .mod4:before {
     content: "Opt ";
 }

-

 .mac .mod12:before {
     content: "Cmd Ctrl ";
 }
 .mac .mod12:before {
     content: "Cmd Ctrl ";
 }

-

 .mac .mod13:before {
     content: "Cmd Shift ";
 }
 .mac .mod13:before {
     content: "Cmd Shift ";
 }

-

 .mac .mod14:before {
     content: "Cmd Opt ";
 }
 .mac .mod14:before {
     content: "Cmd Opt ";
 }

-
-
+.mac .mod23:before {
+    content: "Ctrl Shift ";
+}

 
 #gs_tti0 {
 
 
 #gs_tti0 {