X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=build.py;h=5d6ecfd1fe5af0666c38f3596b12c61220826555;hb=c26b7c1f3feb0c4124335c4e7511855543956436;hp=980ececb386e34dcb061ccae953e4dbfeb40e7f2;hpb=f1607b3d2534e99ad5b8e1f38cd0296a891412c2;p=ardour-manual diff --git a/build.py b/build.py index 980ecec..5d6ecfd 100755 --- a/build.py +++ b/build.py @@ -18,15 +18,25 @@ import shutil import argparse +# Global vars +# 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'@@[^#"]*') + # # Create an all lowercase filename without special characters and with spaces # replaced with dashes. # def MakeFilename(s): - # Cleans up the file name, removing all non ASCII or .-_ chars - fn = re.sub(r'[^.\-_a-zA-Z0-9 ]', '', s) - fn = fn.lower() - fn = fn.replace(' ', '-') + global cleanString + # Clean up the file name, removing all non letter/number or " .-_" chars. + # Also, convert to lower case and replace all spaces with dashes. + fn = cleanString.sub('', s).lower().replace(' ', '-') + # Double dashes can creep in from the above replacement, so we check for + # that here. + fn = fn.replace('--', '-') + return fn @@ -122,7 +132,8 @@ def GetFileStructure(): for i in range(level + 1): fullName = fullName + fnames[i] + '/' - hdr['filename'] = fullName.rstrip('/') + # Strip trailing '/' on filename + hdr['filename'] = fullName[:-1] fs.append(hdr) @@ -226,25 +237,27 @@ def FindInternalLinks(fs): # them with the appropriate link. # def FixInternalLinks(links, content, title): - - # Make key1|key2|key3|... out of our links keys - pattern = re.compile('|'.join(links.keys())) - - # Use a lambda callback to substitute each occurance found - result = pattern.sub(lambda x: links[x.group()], content) - - # Check for missing link targets, and report them to the user - match = re.findall('"@@.*"', result) + global findLinks + match = findLinks.findall(content) + missing = [] if len(match) > 0: - print('\nMissing link target' + ('s' if len(match) > 1 else '') + ' in "' + title + '":') - for s in match: - print(' ' + s[3:-1]) + if s in links: + content = content.replace(s, links[s]) + else: + missing.append(s) + + # Report missing link targets to the user (if any) + if len(missing) > 0: + print('\nMissing link target' + ('s' if len(missing) > 1 else '') + ' in "' + title + '":') + + for s in missing: + print(' ' + s) print() - return result + return content # @@ -259,7 +272,8 @@ def BuildList(lst, fs, pagePos, cList): nextPos = lst[i + 1] if i + 1 < len(lst) else len(fs) active = ' class=active' if curPos == pagePos else '' - content = content + '