From 2e006d9b931807ddc386650766de3a5fe44a271b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Nettingsmeier?= Date: Tue, 4 Feb 2014 22:55:37 +0100 Subject: [PATCH] copy-editing section 6. the beat goes on... --- STYLE_GUIDE | 12 ++- .../04_using-the-nudge-controls.html | 18 +++-- _manual/06_working-with-markers.html | 37 ++++++---- .../01_creating-location-markers.html | 43 ++++++----- .../02_creating-range-markers.html | 21 +++--- .../03_rangesmarks-list.html | 74 +++++++++++++++---- .../04_moving-markers.html | 25 +++++-- .../05_loop-range.html | 18 +++-- .../06_marker-context-menu.html | 58 +++++++++------ .../07_punch-range.html | 16 ++-- source/css/app.css | 6 +- 11 files changed, 223 insertions(+), 105 deletions(-) diff --git a/STYLE_GUIDE b/STYLE_GUIDE index 5c367ab6..4c57d00c 100644 --- a/STYLE_GUIDE +++ b/STYLE_GUIDE @@ -102,6 +102,11 @@ level below its predecessor. Do not abuse headings to style a head line. Every snippet of text should be enclosed in a block level element. The default choice is

, the plain paragraph. + +Cross-reference links in the manual are reasonably stable, since they are +independent of the ordering number (which gets removed from the URL) and the +pretty page title (the URL is created from the file name). So unless a file +is renamed or moved to another sub-directory, links should be ok. 4.1 Inline markups ------------------ @@ -248,8 +253,8 @@ paragraph. additional information, if at all. -5.3 Headline Capitalization ---------------------------- +5.3 Chapter Headline Capitalization +------------------------------------ Capitalization follows https://developer.gnome.org/hig-book/3.6/design-text-labels.html.en#layout-capitalization @@ -260,4 +265,7 @@ https://developer.gnome.org/hig-book/3.6/design-text-labels.html.en#layout-capit Conjunctions: and, but, for, not, so, yet ... Prepositions of three or fewer letters: at, for, by, in, to ... * Keep headlines short and concise. +* secondary headlines in articles are not capitalized +* Do not capitalize concepts in the text body, with the possible exceptions + of _the_ Editor and _the_ Mixer. diff --git a/_manual/05_controlling-playback/04_using-the-nudge-controls.html b/_manual/05_controlling-playback/04_using-the-nudge-controls.html index 64b68987..07f3d08b 100644 --- a/_manual/05_controlling-playback/04_using-the-nudge-controls.html +++ b/_manual/05_controlling-playback/04_using-the-nudge-controls.html @@ -2,10 +2,18 @@ layout: default title: Using the Nudge Controls --- - - - -

If there are no selected objects, the nudge controls can be used to move the playhead by a fixed amount backward or forward. The left and right buttons move either backward or forward in time, and the small clock to the left of these buttons sets the amount of time to nudge by. As with all other clocks, you can right-click on the clock to choose the time representation you want to use.

-

Note that this is a secondary purpose of the nudge controls - it is usually used to move selected objects by specific distances, rather than the playhead.

+

+ If there are no selected objects, the nudge controls can be + used to move the playhead backward or forward by a fixed amount. The left + and right buttons move either backward or forward in time, and the small + clock to the left of these buttons sets the amount of time to nudge by. + As with all other clocks, you can right-click on the clock to choose the + time representation you want to use. +

+

+ Note that this is a secondary purpose of the nudge controls — it is + usually used to move selected objects by specific distances, rather than + the playhead. +

diff --git a/_manual/06_working-with-markers.html b/_manual/06_working-with-markers.html index 6610a992..cb8a13c3 100644 --- a/_manual/06_working-with-markers.html +++ b/_manual/06_working-with-markers.html @@ -2,19 +2,30 @@ layout: default title: Working With Markers --- - - - -

It is very useful to be able to tag different locations in a session for use when editing and mixing. Ardour supports both locations, which define specific single positions in time and ranges which define a start and end position in time.

-

In addition to the standard location markers there are also 3 kinds of special markers:

-
-
CD markers
-
locations that are restricted to legal CD track boundaries, and be used to add track marks/info to compact disc (CD) images.
-
Loop range
-
a range used to define transport loop start and end points.
-
Punch range
-
a range used to define start and/or end points for punch recording
-
+

+ It is very useful to be able to tag different locations in a session for + later use when editing and mixing. Ardour supports both + locations, which define specific positions in time, + and ranges which define a start and end position in time. +

+

+ In addition to the standard location markers, there are three kinds of + special markers: +

+ {% children %} diff --git a/_manual/06_working-with-markers/01_creating-location-markers.html b/_manual/06_working-with-markers/01_creating-location-markers.html index a1f25bd7..e0d64f14 100644 --- a/_manual/06_working-with-markers/01_creating-location-markers.html +++ b/_manual/06_working-with-markers/01_creating-location-markers.html @@ -3,20 +3,29 @@ layout: default title: Creating Location Markers --- - - - -

Location Markers appear in the Location Marker ruler at the top of the Timeline. The "begin" and "end" markers appear automatically, but you can create custom markers at any position in a session.

- -

Add Marker to Current Playhead Position

-

Via Context Menu

-

Right click anywhere on the Location Marker ruler and select New location marker. Then move the marker to the current Playhead location by right clicking on the new marker and selecting Move Mark to Playhead.

-

It is also possible to create a Location Mark at the current playhead using the Editor List For details see Getting To Know the Ranges & Marks List.

-

Via Keyboard

-

To create a Location Marker at the current playhead location using the keyboard press Enter on the numeric keypad.

-

Via Main Menu

-

To create a Location Marker at the current playhead location using pull down mens select Transport > Markers > Add Mark from Playhead.

- -

Add Marker to Specific Position on the Timeline

-

You can create a Location Marker at a specific location in the Timeline by moving the playhead to the specific location and then using the methods outline above.

-

Alternatively, a location marker can be set to a specific location by using the Ranges & Marks tab, using either the Use PH button to move a mark to the current playhead location or the clock to set a specific location manually.

+

+ Location Markers appear in the Locations ruler at the top + of the timeline. The begin and end markers appear + automatically, but you can create custom markers at any position in a + session. +

+

+ To add a marker at the current playhead position, press + Num-↵ (the Enter key on the numeric keypad). + Alternatively, use Transport > Markers > Add + Mark from Playhead. +

+

+ To add a marker at an arbitrary location on the timeline, + navigate to the desired position, right-click on the Locations ruler and + select New Location Marker. + You can also go to the Editor list, click New + Marker and use the clock widget to set its position. +

+

+ For details see + Getting To Know the Ranges + & Marks List and Using Ardour Clock + Displays. +

\ No newline at end of file diff --git a/_manual/06_working-with-markers/02_creating-range-markers.html b/_manual/06_working-with-markers/02_creating-range-markers.html index d7c93c2f..42b7a1f8 100644 --- a/_manual/06_working-with-markers/02_creating-range-markers.html +++ b/_manual/06_working-with-markers/02_creating-range-markers.html @@ -2,20 +2,23 @@ layout: default title: Creating Range Markers --- - -

- Rages are essentially two Location Markers the are grouped + Range markers are essentially two location markers the are grouped together to mark the beginning and end of a section in the timeline.

-

Creating a Range on the timeline

+

Creating a Range on the timeline

- To create a Range on the timeline, right click on the - Range Markers Ruler at the top of the - Timeline then select New Range. + To create a new range, right-click on the + Ranges ruler at the top of the timeline, then select + New Range. Two markers with the same name will appear along the ruler. - Both marks can be moved along the timeline by clicking and dragging them to the desired location. + Both marks can be moved along the timeline by clicking and dragging + them to the desired location. +

+

+ It is also possible to create range markers from a selected range or + region in the Editor window, or to use the Ranges + & Marks List in the Editor list.

-

Creating a Range from the Ranges & Marks List

diff --git a/_manual/06_working-with-markers/03_rangesmarks-list.html b/_manual/06_working-with-markers/03_rangesmarks-list.html index 8982b7e0..97b26539 100644 --- a/_manual/06_working-with-markers/03_rangesmarks-list.html +++ b/_manual/06_working-with-markers/03_rangesmarks-list.html @@ -2,21 +2,67 @@ layout: default title: Ranges & Marks List --- - - - -

The Ranges & Marks List is visible on a tab in the Editor Lists area. If the editor list area isn't visible it can be enabled by checking the box in the main pull down menus View > Show Editor List. The Ranges & Marks list can be used as a single point of control for all range and location markers (including the punch and loop ranges), or as a supplement to other methods of working with them.

+

+ The Ranges & Marks List is a tab in the Editor + Lists area on the right of the Editor window. If the editor + list area isn't visible it can be enabled by checking + View > Show Editor List. + The Ranges & Marks list can be used as a single point + of control for all range and location markers (including the punch and + loop ranges), or as a supplement to other methods of working with them. +

-

Loop/Punch Ranges

-

The first section Loop/Punch Ranges shows the current loop and punch range settings; there are three clocks, the first is the start of the range, the second is the end of the range and the last is the length of the range. The start and end points have a ‘Use PH’ button beside them, which can be clicked to set the corresponding position clock to the current position of the playhead in the editor timeline. Last in the row are 3 checkboxes. The first checkbox is Hide, which hides the marker in the editor. Even though it is now hidden it is possible to still locate to the marker. The next checkbox is Lock, this will lock the marker in the editor so it can't be moved until it is unlocked. The last checkbox is Glue, this fixes the marker position relative to the current tempo and respects changes in tempo.

-

Markers (Including CD Index)

-

The next section is Markers (Including CD Index) which is a list of the session's markers. For each marker there is a name dialog, that can be edited by clicking on it, a clock that represents the location of the marker, a Use PH button that moves the marker to the current playhead location, and four checkboxes. The first checkbox is CD, which sets the marker for Redbook TOC exporting. The Hide, Lock, and Glue buttons all function the same as in the above section.

+

Common elements

+

+ Each section has a set of editable clock widgets + which display + the location of a marker, or the start, end, and duration times of a range, + respectively.
+ The Use PH buttons allow you to set + the corresponding clock to the current playhead position. + A Middle click on any of the clocks will move + the playhead to that location. Both functions are also available from the + clock context menus.
+ Right clicking on any of the clocks brings up a context menu that allows + changing of the display between Timecode, Bars:Beats, Minutes:Seconds, + and Samples.
+

+

+ The — (subtract) button in front of each + user-defined range or marker in the list allows that particular item to + be removed. The name fields of custom ranges and markers can be edited. +

+

+ The Hide checkboxes make markers and ranges invisible + on the respective ruler to reduce visual clutter; the markers remain + active however, and can be used normally.
+ Selecting Lock prevents the respective marker + from being moved until unlocked. + Where applicable, Glue fixes the marker position + relative to the current musical position expressed in bars and beats, rather + than the absolute time. This will make the respective marker follow + changes in the tempo map. +

+

+ At the bottom of the list are buttons to add new markers or ranges. +

+

List sections

-

Ranges (Including CD Track Ranges)

-

The next section is the Ranges (Including CD Track Ranges). Just like the Loop/Punch Ranges section there are three clocks that serve the same purpose. The checkboxes are the same arrangement and function as the Markers (Including CD Index) however without the Glue checkbox

- -

General

-

At the bottom of the list are buttons to add new markers or ranges.

-

The subtract button (-) beside each item in the list allows that particular marker to be removed. A middle click over any of the clocks will locate the playhead at that location in the editor. Right clicking on any of the clocks brings up a context menu that allows changing of the display between, Timecode, Bars:Beats, Minutes:Seconds and Samples. In addition to the clock displays there is an option in the context menu to select Set From Playhead, that sets the markers location to the current location of the playhead in the editor window, and Locate to This Time, that moves the playhead to the location of the position listed in the clock.

+
+
Loop/Punch Ranges
+
This list shows the current loop and punch range + settings. Since these are built-in ranges, you cannot rename or remove them.
+
Markers (Including CD Index)
+
This section lists the session's markers. By ticking CD, you instruct Ardour to create a CD track + index from this marker, which will be included in the TOC or CUE file when you + export.
+
Ranges (Including CD Track Ranges)
+
This is the list of ranges (including CD track + ranges). Ticking CD will convert + the range to a CD track, which will again be included in + exported TOC or CUE files. This is relevant for Disk-At-Once recordings + that may contain audio data between tracks.
diff --git a/_manual/06_working-with-markers/04_moving-markers.html b/_manual/06_working-with-markers/04_moving-markers.html index 9cb7b465..77e93bd8 100644 --- a/_manual/06_working-with-markers/04_moving-markers.html +++ b/_manual/06_working-with-markers/04_moving-markers.html @@ -2,12 +2,25 @@ layout: default title: Moving Markers --- - - -

Single marker

-

Click and drag to move a single marker to a new location on the timeline.

+

Single marker

+

+ Left-click and drag to move a single marker to a + new location on the timeline. +

+

Multiple markers

-

It is possible to move multiple markers by the same distance. Ctrl-click each marker you want to move, then drag one of the selected markers to a new location. All other selected markers will move together. Note that the markers are bounded by the zero point on the timeline. In otherwords the first marker in your selection cannot move to the left of zero on the timeline.

+

+ It is possible to move multiple markers by the same distance. Left-click each marker you want to move, then drag + one of the selected markers to a new location. All selected markers will + then move together. Note that the markers are bounded by the zero point on + the timeline. In other words, the first marker in your selection cannot move + to the left of zero on the timeline. +

+

Both ends of a range marker

-

Ctrl-drag one end of the range marker (either the start or the end). The other end of range marker will move by the same distance.

+

+ Left-drag either end of the range marker. The + other end will move by the same distance. +

diff --git a/_manual/06_working-with-markers/05_loop-range.html b/_manual/06_working-with-markers/05_loop-range.html index 95f50f71..4f09cdad 100644 --- a/_manual/06_working-with-markers/05_loop-range.html +++ b/_manual/06_working-with-markers/05_loop-range.html @@ -1,12 +1,16 @@ --- layout: default -title: Loop Range +title: The Loop Range --- - + +

+ The loop range is a special range that defines the start and end points + for loop play, which can be enabled in the transport bar. +

+

+ It can be defined via the timeline or the Ranges & Marks + list. +

- -

The loop range is a special range that defines the start and end points when loop-mode is enabled in the transport bar.

-

Defining the loop range on the timeline

-

Defining the loop range in the Locations+Marks list

- diff --git a/_manual/06_working-with-markers/06_marker-context-menu.html b/_manual/06_working-with-markers/06_marker-context-menu.html index a6f3bd99..f4dbb196 100644 --- a/_manual/06_working-with-markers/06_marker-context-menu.html +++ b/_manual/06_working-with-markers/06_marker-context-menu.html @@ -3,30 +3,40 @@ layout: default title: Marker Context Menu --- - - - -

Several operations on markers are available by right-clicking them to open the marker context menu. From this menu, you can:

+

+ Right-clicking a marker in the timeline opens the + marker context menu. From this menu, you can: +

-
Locate to Here
-
move the playhead to this marker's position.
-
Play from Here
-
start playback from this marker's position.
-
Move Mark to Playhead
-
move this marker to the current playhead position. -
-
Create Range to Next Marker
-
create a range marker between this location and the next one along on the timeline.
-
Hide
-
hide this marker from the view. It can be re-shown from the Locations window
-
Rename
-
change the name of the marker.
-
Lock
-
if this is ticked, it will be impossible to drag the marker's position; useful if you want to prevent accidental movements.
-
Glue to Bars and Beats
-
if this is ticked, the marker will maintain its position in bars and beats even if there are changes in tempo and meter
-
Remove
-
removes the marker.
+
Locate to Here
+
Move the playhead to this marker's position.
+
Play from Here
+
start playback from this marker's position.
+
Move Mark to Playhead
+
Move this marker to the current playhead position.
+
Create Range to Next Marker
+
Create a range marker between this location and the next one along on + the timeline.
+
Hide
+
Hide this marker from the view. It can be made visible again from the + Window > Locations window or the Ranges & Marks + list.
+
Rename
+
Change the name of the marker.
+
Lock
+
If this is ticked, it will be impossible to drag the marker's + position; useful if you want to prevent accidental movements.
+
Glue to Bars and Beats
+
If this is ticked, the marker will maintain its position in bars and + beats even if there are changes in tempo and meter.
+
Remove
+
Removes the marker.
-

There are also a few options on the Active Mark submenu of the Transport menu. These options apply to the currently selected location marker, and move it to a nearby region boundary, region sync point, or to the playhead or mouse.

+

+ There are also a few options in Transport > Active + Mark. These options apply to the currently selected location marker, + and move it to a nearby region boundary, region sync point, or to the + playhead or mouse. +

diff --git a/_manual/06_working-with-markers/07_punch-range.html b/_manual/06_working-with-markers/07_punch-range.html index 4d343acf..c58d082a 100644 --- a/_manual/06_working-with-markers/07_punch-range.html +++ b/_manual/06_working-with-markers/07_punch-range.html @@ -2,11 +2,15 @@ layout: default title: Punch Range --- - + +

+ The punch range is a special range used to define where + recording will start and/or stop during a punch. +

+

+ It can be defined on the timeline or in the + Ranges & Marks + list. +

- -

The punch range is a special range used to define where recording will start and/or stop during a punch.

-

Defining the punch range on the timeline

-

Defining the punch range in the Ranges & Marks list

- diff --git a/source/css/app.css b/source/css/app.css index ac31e379..3fb82b51 100644 --- a/source/css/app.css +++ b/source/css/app.css @@ -324,7 +324,6 @@ kbd.menu,kbd.option,kbd.optoff { } kbd.option:after,kbd.optoff:after { - content:'x'; font-family:mono; font-weight:lighter; text-align:center; @@ -332,7 +331,10 @@ kbd.option:after,kbd.optoff:after { -moz-border-radius:10px; border-radius:10px; margin-left:0.3em; - margin-right:0.5em; +} +kbd.option:after { + content:'X'; + } kbd.optoff:after { content:' ';