X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=implode.py;h=b744d1f0d089ed449e52b4da8238c2a5b39eba5c;hb=d7195f70afb10d47242c3325238d6d45470dafe5;hp=f98d2eca25332dad00f62c5e35575103d1115dc7;hpb=f1607b3d2534e99ad5b8e1f38cd0296a891412c2;p=ardour-manual

diff --git a/implode.py b/implode.py
index f98d2ec..b744d1f 100755
--- a/implode.py
+++ b/implode.py
@@ -91,12 +91,6 @@ for line in master:
 			if 'menu_title' in header:
 				implode.write('menu_title: ' + header['menu_title'] + '\n')
 
-			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 +101,12 @@ for line in master:
 				implode.write('include: ' + header['include'] + '\n')
 				implode.write('exclude: yes\n')
 
+		if 'link' in header:
+			implode.write('link: ' + header['link'] + '\n')
+
+		if 'uri' in header:
+			implode.write('uri: ' + header['uri'] + '\n')
+
 		implode.write('part: ' + header['part'] + '\n' + '---\n')
 
 		# Only parts have no content...
@@ -137,7 +137,10 @@ for line in master:
 					while fromFile.readline().startswith('---') == False:
 						pass
 
-				shutil.copyfileobj(fromFile, implode)
+#				shutil.copyfileobj(fromFile, implode)
+				# Strip trailing newlines from content...
+				tempContent = fromFile.read().rstrip('\r\n')
+				implode.write(tempContent + '\n')
 				fromFile.close()
 				delList.append(inclFile)