diff --git a/build.py b/build.py index 2345dbce..e656fd19 100755 --- a/build.py +++ b/build.py @@ -6,6 +6,8 @@ # by James Hammons # (C) 2017 Underground Software # +# Contributors: Ed Ward +# # Remnants (could go into the master document as the first header) @@ -83,7 +85,7 @@ def PartToLevel(s): # -# Converts a integer to a roman number +# Converts a integer to a Roman numeral # def num2roman(num): num_map = [(1000, 'M'), (900, 'CM'), (500, 'D'), (400, 'CD'), (100, 'C'), (90, 'XC'), (50, 'L'), (40, 'XL'), (10, 'X'), (9, 'IX'), (5, 'V'), (4, 'IV'), (1, 'I')] @@ -200,6 +202,7 @@ def GetParent(fs, pos): return pos + # # Change the hierarchy of titles : h1->hn, h2->hn+1, etc... n being delta-1 # @@ -209,6 +212,7 @@ def reheader(txt, delta): txt = txt.replace(' 0: if 'include' in header: srcFile = open('include/' + header['include']) @@ -589,12 +594,16 @@ for header in fileStruct: # Add header information to the page if in dev mode if devmode: devnote ='' + content # ----- One page and PDF version ----- @@ -664,18 +673,21 @@ onepage = onepage.replace('{{ content }}', '') # cleans up the last spaceholder onepageFile.write(onepage) onepageFile.close() -if not quiet: - print('Generating the PDF...') -# Create the PDF version of the documentation -pdfpageFile = open(global_site_dir + 'pdf.html', 'w') -pdfpage = pdfpage.replace('{% tree %}', opsidebar) # create the TOC -pdfpage = pdfpage.replace('{{ content }}', '') # cleans up the last spaceholder -pdfpageFile.write(pdfpage) -pdfpageFile.close() +if not nopdf: + if not quiet: + print('Generating the PDF...') -from weasyprint import HTML -doc = HTML(filename = global_site_dir + 'pdf.html') #, base_url = os.path.dirname(os.path.realpath(__file__))) -doc.write_pdf(global_site_dir + 'manual.pdf') + # Create the PDF version of the documentation + pdfpageFile = open(global_site_dir + 'pdf.html', 'w') + pdfpage = pdfpage.replace('{% tree %}', opsidebar) # create the TOC + pdfpage = pdfpage.replace('{{ content }}', '') # cleans up the last spaceholder + pdfpageFile.write(pdfpage) + pdfpageFile.close() + + from weasyprint import HTML + doc = HTML(filename = global_site_dir + 'pdf.html') + doc.write_pdf(global_site_dir + 'manual.pdf') if not quiet: print('Processed ' + str(fileCount) + ' files.') + diff --git a/include/automation-curves.html b/include/automation-curves.html index b8ae3e7f..f21f4d85 100644 --- a/include/automation-curves.html +++ b/include/automation-curves.html @@ -6,13 +6,27 @@

An automation curve is a series of lines connected by control - points that defines a continuous line. As the curve is traversed from - left to right, the line defines the level of the parameter controlled by the - automation lane. + points that typically defines a continuous line. As the curve is + traversed from left to right, the line defines the level of the parameter + controlled by the automation lane.

- The curve by itself does nothing; it will only control playback if - the lane it is in is in Play mode. + There are two types of automation curves: Linear and + Discrete. The most common type is Linear, in which the space between any two contiguous + control points is continuously interpolated; in other words, the values + between any two contiguous control points at any given time is given by the + straight line connecting them. The second type of automation curve is Discrete, in which no interpolation between control points + is done; whatever value the control point is set at is the value it will + yield until it reaches the next control point, at which point it will give + that value until the next control point, and so on until there are no more + control points. +

+ +

+ The curve by itself does nothing; it will only control playback if + the lane it resides in is in Play mode.

diff --git a/include/automation-modes.html b/include/automation-modes.html index 11ce20c9..181ec690 100644 --- a/include/automation-modes.html +++ b/include/automation-modes.html @@ -1,27 +1,25 @@ -

- Ardour offers two modes for connecting automation control points: Discrete and Linear. The mode is - changed by a right click on the automation lane header and choosing the - mode from the mode menu. +

+ADD IMAGES PLEASE

- Discrete mode has stair steps between each point on the - automation track. This is useful for on-off automation like mute or sustain - pedal (on a piano MIDI track). + Ardour offers two modes for interpolating automation control points: Linear and Discrete. The mode is + changed by a Right click on the automation lane header + and choosing the mode from the mode menu.

- When recording automation via MIDI (for example a pitch bend from a keyboard), - Ardour always uses discreet mode. + Linear mode interpolates values between control points in a given automation curve by connecting them with straight lines; the values played back are derived from the points that lie on the lines thus defined. Typically, this is what is desired and is the default mode for all automation lanes.

- Linear mode has straight lines betwen each point on the - automation track. This is useful for gradual shifts in automation lanes, - such as gradual increase in volume on the fader. - - Linear is the default mode for most automation lanes created via mouse input - (versus recording via MIDI). + Discrete mode does no interpolation between control points in a given automation curve. The values set by the control points do not change until the following control point is reached at which time the value is then set to its value; this continues on until there are no more control points. Typically this is used for parameters such as mute or sustain pedal (e.g., on a MIDI piano track).

+ +

+ When recording automation via MIDI (e.g., pitch bend from a MIDI keyboard), + Ardour always uses discrete mode. +

+ diff --git a/include/automation-nomenclature.html b/include/automation-nomenclature.html index dc634ee7..af306d08 100644 --- a/include/automation-nomenclature.html +++ b/include/automation-nomenclature.html @@ -10,10 +10,11 @@ control that allows setting the amount or position of a certain parameter associated with the lane. Parameters are things that can be controlled on a track's automation lane, such as volume, panning, muting, - trim, etc. Automation curves consist of lines connected by + trim, etc. Automation curves typically consist of lines connected by control points, that live within the confines of a lane; these tell Ardour how to change a given parameter over time. Automation - modes specify whether the control points are connected by lines or - stair steps. Automation states govern how a given automation lane - will behave during playback. + modes define how Ardour creates the values in between the control + points of a given automation curve, either by connecting them with continuous + lines or not. Automation states govern how a given automation lane + will behave during playback.

diff --git a/master-doc.txt b/master-doc.txt index b4b66aae..9c76da43 100644 --- a/master-doc.txt +++ b/master-doc.txt @@ -1695,13 +1695,6 @@ link: automation-states part: subchapter --- ---- -title: Automation Modes -include: automation-modes.html -link: automation-modes -part: subchapter ---- - --- title: Automation Lanes include: automation-lanes.html @@ -1716,6 +1709,13 @@ link: automation-curves part: subchapter --- +--- +title: Automation Modes +include: automation-modes.html +link: automation-modes +part: subchapter +--- + --- title: Controlling a Track with Automation menu_title: Track Automation