Reworked the push/pull trimming

[ardour-manual] / build.py

diff --git a/build.py b/build.py
index 127f43f84b01cfd19a8aaebc3de76275a99c0bdc..6d343b61c60f50f3bfea302446a8e7ca02b05974 100755 (executable)
--- a/build.py
+++ b/build.py
@@ -188,6 +188,7 @@ def GetChildren(fs, pos):
 
        return children
 
+
 #
 # Get the parent at this level
 #
@@ -195,25 +196,29 @@ def GetParent(fs, pos):
        thisLevel =  fs[pos]['level']
        pos = pos - 1
 
-       while fs[pos]['level'] >= thisLevel and pos > 0:
+       while pos >= 0 and fs[pos]['level'] >= thisLevel:
                pos = pos - 1
 
        return pos
 
+
 #
 # Creates the BreadCrumbs
 #
 def GetBreadCrumbs(fs, pos):
-       breadcrumbs = ' <span class="divider">&gt;</span> <li class="active">'+ fs[pos]['title'] + '</li>'
        # The <span class="divider">&gt;</span> is for Bootstrap pre-3.0
-       while pos:
-               pos = GetParent(fs,pos)
-               if pos:
+       breadcrumbs = ' <span class="divider">&gt;</span> <li class="active">'+ fs[pos]['title'] + '</li>'
+
+       while pos >= 0:
+               pos = GetParent(fs, pos)
+
+               if pos >= 0:
                        breadcrumbs=' <span class="divider">&gt;</span> <li><a href="/' + fs[pos]['filename'] + '/">'+ fs[pos]['title'] + '</a></li>'+ breadcrumbs
 
        breadcrumbs = '<ol class="breadcrumb"><li><a href="/toc/index.html">Home</a></li>' + breadcrumbs + '</ol>'
        return breadcrumbs
 
+
 #
 # Make an array of children attached to each node in the file structure
 # (It's a quasi-tree structure, and can be traversed as such.)
@@ -443,9 +448,9 @@ for header in fileStruct:
        elif level == 2:
                toc = toc + '    <a id=subchapter href="/' + header['filename'] + '/">' + header['title'] + '</a><br>\n'
        elif level == 3:
-               toc = toc + '      <a id=subchapter href="/' + header['filename'] + '/">' + header['title'] + '</a><br>\n'
+               toc = toc + '      <a id=section href="/' + header['filename'] + '/">' + header['title'] + '</a><br>\n'
        elif level == 4:
-               toc = toc + '      <a id=subchapter href="/' + header['filename'] + '/">' + header['title'] + '</a><br>\n'
+               toc = toc + '      <a id=subsection href="/' + header['filename'] + '/">' + header['title'] + '</a><br>\n'
 
        # Make the 'this thing contains...' stuff
        if HaveChildren(fileStruct, pageNumber):
@@ -555,3 +560,4 @@ tocFile.close()
 
 if not quiet:
        print('Processed ' + str(fileCount) + ' files.')
+