Initial cleanup of manual content.

[ardour-manual] / implode.py

diff --git a/implode.py b/implode.py
index f98d2eca25332dad00f62c5e35575103d1115dc7..2dc163fc71095c2e1b971ed2523a3ebef1df37b5 100755 (executable)
--- a/implode.py
+++ b/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...
@@ -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)