Fix a typo (remove odd word)

[ardour-manual] / build.py

diff --git a/build.py b/build.py
index baf1f63e150f3428105174bce6aa1e00b0ee0bbf..50ff861f471e7ed9912e677d590c36540fd54283 100755 (executable)
--- a/build.py
+++ b/build.py
@@ -22,7 +22,7 @@ import argparse
 # This matches all *non* letter/number, ' ', '.', '-', and '_' chars
 cleanString = re.compile(r'[^a-zA-Z0-9 \._-]+')
 # This matches new 'unbreakable' links, up to the closing quote or anchor
-findLinks = re.compile(r'@@[^#"]*')
+findLinks = re.compile(r'"@@[^#"]*[#"]')
 githuburl = 'https://github.com/Ardour/manual/edit/master/include/'
 
 #
@@ -257,14 +257,15 @@ def FindInternalLinks(fs):
 
        for hdr in fs:
                if 'link' in hdr:
-                       linkDict['@@' + hdr['link']] = '/' + hdr['filename'] + '/'
+                       linkDict['"@@' + hdr['link'] + '"'] = '"/' + hdr['filename'] + '/"'
+                       linkDict['"@@' + hdr['link'] + '#'] = '"/' + hdr['filename'] + '/index.html#'
 
        return linkDict
 
 
 #
 # Internal links are of the form '@@link-name', which are references to the
-# 'link:' field in the part header. We have to find all occurances and replace
+# 'link:' field in the part header. We have to find all occurrences and replace
 # them with the appropriate link.
 #
 def FixInternalLinks(links, content, title):
@@ -464,17 +465,16 @@ for header in fileStruct:
 
        parent = GetParent(fileStruct, pageNumber)
 
-       # Make the 'Previous' & 'Next' content
+       # Make the 'Previous', 'Up' & 'Next' content
        nLink = ''
        pLink = ''
        uLink = ''
 
-
        if pageNumber > 0:
-               pLink = '<li><a title="' + fileStruct[pageNumber - 1]['title'] + '" href="/' + fileStruct[pageNumber - 1]['filename'] + '/" class="previous"> &larr; Previous </a></li>'
+               pLink = '<li class="previous"><a title="' + fileStruct[pageNumber - 1]['title'] + '" href="/' + fileStruct[pageNumber - 1]['filename'] + '/" class="previous"> &larr; Previous </a></li>'
 
        if pageNumber < len(fileStruct) - 1:
-               nLink = '<li><a title="' + fileStruct[pageNumber + 1]['title'] + '" href="/' + fileStruct[pageNumber + 1]['filename'] + '/" class="next"> Next &rarr; </a></li>'
+               nLink = '<li class="next"><a title="' + fileStruct[pageNumber + 1]['title'] + '" href="/' + fileStruct[pageNumber + 1]['filename'] + '/" class="next"> Next &rarr; </a></li>'
 
        if level > 0:
                uLink = '<li><a title="' + fileStruct[parent]['title'] + '" href="/' + fileStruct[parent]['filename'] + '/" class="active"> &uarr; Up </a></li>'
@@ -493,11 +493,11 @@ for header in fileStruct:
        # Chapters, subchapters, sections & subsections can all have content,
        # but the basic fundamental organizing unit WRT content is still the
        # chapter.
-       githublink = ''
+       githubedit = ''
        if level > 0:
                if 'include' in header:
                        srcFile = open('include/' + header['include'])
-                       githublink = '<div style="float:right;"><a title="Edit in GitHub" href="' + githuburl + header['include'] + '"><img src="/images/github.png"></a></div>'
+                       githubedit = '<span style="float:right;"><a title="Edit in GitHub" href="' + githuburl + header['include'] + '"><img src="/images/github.png" alt="Edit on GitHub"/></a></span>'
                        content = srcFile.read()
                        srcFile.close()
 
@@ -538,7 +538,7 @@ for header in fileStruct:
        page = page.replace('{{ page.title }}', header['title'])
        page = page.replace('{% tree %}', sidebar)
        page = page.replace('{% prevnext %}', prevnext)
-       page = page.replace('{% githublink %}', githublink)
+       page = page.replace('{% githubedit %}', githubedit)
        page = page.replace('{% breadcrumbs %}', breadcrumbs)
        page = page.replace('{{ content }}', content + more)
 
@@ -563,6 +563,7 @@ page = page.replace('{{ page.title }}', 'Ardour Table of Contents')
 page = page.replace('{% tree %}', sidebar)
 page = page.replace('{{ content }}', toc)
 page = page.replace('{% prevnext %}', '')
+page = page.replace('{% githubedit %}', '')
 page = page.replace('{% breadcrumbs %}', '')
 
 os.mkdir(siteDir + 'toc', 0o775)