diff --git a/include/about-ardours-interface.html b/include/about-ardours-interface.html index e643126..52add95 100644 --- a/include/about-ardours-interface.html +++ b/include/about-ardours-interface.html @@ -1,6 +1,3 @@ ---- -title: Ardour's Interface ----

In Ardour, work is done in two main windows: the Editor and the @@ -131,8 +128,3 @@ title: Ardour's Interface To learn more about the process of mixing, see Mixing.

-<<<<<<< HEAD - -{% children %} -======= ->>>>>>> Initial cleanup of manual content. diff --git a/include/mini-timeline.html b/include/mini-timeline.html index 26e6e12..6227b4a 100644 --- a/include/mini-timeline.html +++ b/include/mini-timeline.html @@ -1,26 +1,36 @@ + +
The Mini-Timeline +
The Mini-Timeline.
+

- The mini-timeline allows, as the Summary, - to navigate a session. It's main advantage though is that it stays visible even in Mixer mode. + The mini-timeline allows, as the + Summary does, navigation of a + session. Its main advantage, though, is that it stays visible even when in + Mixer mode.

- The range of time covered by the mini-timeline is set by Right clicking the - timeline, and chossing from 30 seconds up to 20 minutes. + The range of time covered by the mini-timeline is set by Right clicking the timeline, and choosing a time span + from 30 seconds up to 20 minutes.

- The mini-timeline also shows all the markers (both start/end and user set ones). - Clicking a marker jumps to that point on the timeline, allowing for quick access - to key timings in the session. + The mini-timeline also shows all markers (start, end and any user + defined ones). Clicking a marker jumps to that point on the timeline, + allowing for quick access to key timings in the session.

+

While hovering with the mouse over the mini-timeline,

+ + diff --git a/include/other-toolbar-items.html b/include/other-toolbar-items.html index 934e086..1a0ebc1 100644 --- a/include/other-toolbar-items.html +++ b/include/other-toolbar-items.html @@ -68,3 +68,4 @@ The buttons in between the Mode Selector and the global meter are script buttons, which are user-definable buttons to attach any session lua-script to.

+ diff --git a/include/plugin-manager.html b/include/plugin-manager.html index f018684..602895e 100644 --- a/include/plugin-manager.html +++ b/include/plugin-manager.html @@ -15,7 +15,10 @@ connections. The plugins can be sorted by clicking on a column header.

+
Plugin Manager window +
The Plugin Manager window.
+

Plugin Display Status

diff --git a/include/selection-and-punch-clocks.html b/include/selection-and-punch-clocks.html index cf53877..63731bc 100644 --- a/include/selection-and-punch-clocks.html +++ b/include/selection-and-punch-clocks.html @@ -70,3 +70,4 @@

See Track Modes for more information.

+ diff --git a/include/transport-bar.html b/include/transport-bar.html index c12426c..9893bc8 100644 --- a/include/transport-bar.html +++ b/include/transport-bar.html @@ -72,3 +72,4 @@

Go to the Transport and Transport > Playhead to find more.

+ diff --git a/master-doc.txt b/master-doc.txt index 0df1f59..184d613 100644 --- a/master-doc.txt +++ b/master-doc.txt @@ -578,7 +578,6 @@ part: chapter --- title: Transport Clocks include: transport-clocks.html -#uri: ardours-interface/transport-clocks uri: ardours-interface/using-ardour-clock-displays part: chapter --- @@ -633,7 +632,6 @@ part: subchapter --- title: Edit Point Control include: edit-point-control.html -#uri: ardours-interface/the-edit-point-control uri: editing-and-arranging/edit-point part: subchapter --- @@ -778,7 +776,6 @@ part: chapter --- title: New/Open Session Dialog include: newopen-session-dialog.html -#uri: working-with-sessions/new-session-dialog uri: working-with-sessions/the-new-session-dialog part: subchapter --- @@ -1446,7 +1443,6 @@ part: subchapter --- title: Note Selection include: note-selection.html -#uri: working-with-midi/note-selection uri: editing-and-arranging/edit-midi/note-selection part: subchapter --- @@ -2065,7 +2061,6 @@ part: chapter --- title: Scripting part: part -include: lua-scripting-in-ardour.html --- --- diff --git a/source/css/app.css b/source/css/app.css index 0802831..d520d30 100644 --- a/source/css/app.css +++ b/source/css/app.css @@ -186,7 +186,15 @@ #content figcaption { display: table-caption; - caption-side: bottom ; + caption-side: bottom; + font-style: italic; +} + +#content figcaption.center { + display: table-caption; + text-align: center; + caption-side: bottom; + font-style: italic; } #content figcaption.titleover { @@ -195,14 +203,19 @@ #content figure.right { margin: 0 0 1em 1em; - float:right; - clear:right; + float: right; + clear: right; } #content figure.left { margin: 0 1em 1em 0; - float:left; - clear:left; + float: left; + clear: left; +} + +#content figure.center { + margin: 1em auto 1em auto; + clear: both; } .multicol2 { @@ -480,6 +493,12 @@ samp:after { clear:left; } +#content img.center { + display: block; + margin:1em auto 1em auto; + clear: both; +} + #content p.center { text-align:center; } @@ -522,7 +541,7 @@ samp:after { } - +/* Keyboard modifiers */ .mod1:before { content: "Ctrl "; @@ -552,6 +571,36 @@ samp:after { content: "Keypad "; } +/* Variants *without* space after them (yes, these are needed!) */ + +.mod1n:before { + content: "Ctrl"; +} +.mod2n:before { + content: "Alt"; +} +.mod3n:before { + content: "Shift"; +} +.mod4n:before { + content: "Win"; +} +.mod12n:before { + content: "Ctrl Alt"; +} +.mod13n:before { + content: "Ctrl Shift"; +} +.mod14n:before { + content: "Ctrl Win"; +} +.mod23n:before { + content: "Alt Shift"; +} + + +/* Automagic translation for Mac based display */ + .mac .mod1:before { content: "Cmd "; } @@ -577,6 +626,34 @@ samp:after { content: "Ctrl Shift "; } +/* No space variants (Mac based) */ + +.mac .mod1n:before { + content: "Cmd"; +} +.mac .mod2n:before { + content: "Ctrl"; +} +.mac .mod3n:before { + content: "Shift"; +} +.mac .mod4n:before { + content: "Opt"; +} +.mac .mod12n:before { + content: "Cmd Ctrl"; +} +.mac .mod13n:before { + content: "Cmd Shift"; +} +.mac .mod14n:before { + content: "Cmd Opt"; +} +.mac .mod23n:before { + content: "Ctrl Shift"; +} + + #gs_tti0 { padding-top: 2px;