Collapse diagrams/ into images/.

_manual/11_working-with-tracks/08_midi-track-controls.html

@@ -4,7 +4,7 @@ title: MIDI Track Controls
 ---                        
   
 <p>A typical <dfn>MIDI track header</dfn> looks like this:</p>
-<img src="/diagrams/typical-midi-track-controls.png" alt="midi track controls"
+<img src="/images/typical-midi-track-controls.png" alt="midi track controls"
   />
   
 <p>

_manual/16_recording/01_monitoring/02_monitor-signal-flow.html

@@ -8,7 +8,7 @@ menu_title: Signal Flow
 
 <h3>External Monitoring</h3> 
 <img class="right"
-src="/diagrams/external-monitoring.png" />
+src="/images/external-monitoring.png" />
 <p>When using <dfn>external monitoring</dfn>, Ardour plays no role in
   monitoring at all. Perhaps the recording set-up has an external mixer which
   can be used to set up monitor mixes, or perhaps the sound-card being used
@@ -17,7 +17,7 @@ src="/diagrams/external-monitoring.png" />
   settings are less flexible and not saved with the session.</p> 
 
 <h3>JACK-Based Hardware Monitoring</h3> 
-<img class="right" src="/diagrams/jack-monitoring.png" />
+<img class="right" src="/images/jack-monitoring.png" />
 <p>Some sound cards have the ability
   to mix signals from their inputs to their outputs with very low or even zero 
   latency, a feature called <dfn>hardware monitoring</dfn>.
@@ -28,7 +28,7 @@ src="/diagrams/external-monitoring.png" />
 </p> 
 
 <h3>Software Monitoring</h3> 
-<img class="right" src="/diagrams/ardour-monitoring.png" />
+<img class="right" src="/images/ardour-monitoring.png" />
 <p>With the <dfn>software monitoring</dfn> approach, all monitoring is
   performed by Ardour &mdash; it makes track inputs available at track
   outputs, governed by various controls. This approach will almost always have

_manual/20_mixing/01_muting-and-soloing.html

@@ -73,8 +73,8 @@ title: Muting and Soloing
 <p>
   The solo-mute arrangement with a monitor bus is shown below:
 </p>
-<img src="/diagrams/solo-mute.png" alt="mute/solo signal flow" />
+<img src="/images/solo-mute.png" alt="mute/solo signal flow" />
-<p> 
+<p>
   Here we have a number of tracks or busses (in orange). Each one has an 
   output which feeds the master bus. In addition, each has PFL and AFL 
   outputs; we have a choice of which to use. PFL/AFL from each track or 

_manual/22_synchronization/02_latency-and-latency-compensation.html

@@ -48,7 +48,7 @@ menu_title: Latency
 
 <h2>The Latency chain</h2>
 
-<img src="/diagrams/latency-chain.png"  title="Latency chain" alt="Latency chain" />
+<img src="/images/latency-chain.png"  title="Latency chain" alt="Latency chain" />
 <p>
   <em>Figure: Latency chain.</em> 
   The numbers are an example for a typical PC. With professional gear and an 
@@ -171,7 +171,7 @@ menu_title: Latency
   In order to compensate for latency, JACK or JACK applications need to know 
   exactly how long a certain signal needs to be read-ahead or delayed:
 </p>
-<img src="/diagrams/jack-latency-excerpt.png"  title="Jack Latency Compensation" alt="Jack Latency Compensation" />
+<img src="/images/jack-latency-excerpt.png"  title="Jack Latency Compensation" alt="Jack Latency Compensation" />
 <p>
   <em>Figure: Jack Latency Compensation.</em>  
 </p>

_manual/22_synchronization/03_timecode-generators-and-slaves.html

@@ -233,7 +233,7 @@ title: Timecode Generators and Slaves
   the video Frame boundaries.
 </p>
 
-<img src="/diagrams/ltc-transport-alignment.png"  title="LTC frame alignment" alt="LTC frame alignment"/>
+<img src="/images/ltc-transport-alignment.png"  title="LTC frame alignment" alt="LTC frame alignment"/>
 <p><em>Figure: LTC frame alignment for the 525/60 TV standard</em></p>
 
 <p>

explode.py

@@ -114,9 +114,6 @@ for line in master:
 			if 'link' in header:
 				explode.write('link: ' + header['link'] + '\n')
 
-			if 'uri' in header:
-				explode.write('uri: ' + header['uri'] + '\n')
-
 			if 'style' in header:
 				explode.write('style: ' + header['style'] + '\n')
 
@@ -129,6 +126,9 @@ for line in master:
 				explode.write('include: ' + inclFile + '\n')
 				filenames.append(inclFile)
 
+		if 'uri' in header:
+			explode.write('uri: ' + header['uri'] + '\n')
+
 		explode.write('part: ' + header['part'] + '\n' + '---\n')
 
 		# Only parts have no content...

implode.py

@@ -94,9 +94,6 @@ for line in master:
 			if 'link' in header:
 				implode.write('link: ' + header['link'] + '\n')
 
-			if 'uri' in header:
-				implode.write('uri: ' + header['uri'] + '\n')
-
 			if 'style' in header:
 				implode.write('style: ' + header['style'] + '\n')
 
@@ -107,6 +104,9 @@ for line in master:
 				implode.write('include: ' + header['include'] + '\n')
 				implode.write('exclude: yes\n')
 
+		if 'uri' in header:
+			implode.write('uri: ' + header['uri'] + '\n')
+
 		implode.write('part: ' + header['part'] + '\n' + '---\n')
 
 		# Only parts have no content...