Commit 9e708eb5fbc2138cf7e2a8468ebf6d1b209e2703
2001-01-15T23:11:55
formatting
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172
diff --git a/ChangeLog b/ChangeLog
index 1743041..bda0124 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,11 @@
-2001-01-11 Matthew Crosby <mcrosby@marthon.org>
+2001-01-11 David Turner <david.turner@freetype.org>
- * src/pcd/pcfread.c: removed some compilation warnings related
- to comparison of signed vs. unsigned integers
+ * src/pcd/pcfread.c: Removed some compilation warnings related
+ to comparison of signed vs. unsigned integers.
- * include/freetype/internal/ftdebug.h: changed the debug trace
+ * include/freetype/internal/ftdebug.h: Changed the debug trace
constants from trace_t2xxxx to trace_cffxxxx to be able to compile
- the CFF driver in debug mode
+ the CFF driver in debug mode.
2001-01-11 Matthew Crosby <mcrosby@marthon.org>
diff --git a/docs/docmaker.py b/docs/docmaker.py
index f39ef78..ac1c2d7 100644
--- a/docs/docmaker.py
+++ b/docs/docmaker.py
@@ -247,15 +247,16 @@ class DocParagraph:
alphanum = string.lowercase + string.uppercase + string.digits + '_'
for word in self.words:
-
- # process cross references when needed
+ # process cross references if needed
+ #
if identifiers and word and word[0] == '@':
- word = word[1:]
+ word = word[1:]
- # we need to find non alpha numeric charaters
- i = len(word)
- while i > 0 and not word[i-1] in alphanum:
- i = i-1
+ # we need to find non-alphanumeric characters
+ #
+ i = len( word )
+ while i > 0 and not word[i - 1] in alphanum:
+ i = i - 1
if i > 0:
extra = word[i:]
@@ -263,27 +264,29 @@ class DocParagraph:
block = identifiers.get( word )
if block:
- word = '<a href="'+block.html_address()+'">' + word + '</a>'
+ word = '<a href="' + block.html_address() + '">' + word + '</a>'
else:
- word = '?'+word
+ word = '?' + word
if cursor + len( word ) + 1 > max_width:
print line
cursor = 0
line = ""
- line = line + word
+ line = line + word
if not extra:
line = line + " "
+
cursor = cursor + len( word ) + 1
- # handle trailing periods, commas, etc.. at the end of
- # cross references..
+ # handle trailing periods, commas, etc. at the end of
+ # cross references.
+ #
if extra:
if cursor + len( extra ) + 1 > max_width:
print line
cursor = 0
- line = ""
+ line = ""
line = line + extra + " "
cursor = cursor + len( extra ) + 1
@@ -562,15 +565,15 @@ class DocContent:
class DocBlock:
def __init__( self, block_line_list = [], source_line_list = [] ):
- self.items = [] # current ( marker, contents ) list
- self.section = None # section this block belongs to
- self.filename = "unknown" # filename defining this block
- self.lineno = 0 # line number in filename
+ self.items = [] # current ( marker, contents ) list
+ self.section = None # section this block belongs to
+ self.filename = "unknown" # filename defining this block
+ self.lineno = 0 # line number in filename
- marker = None # current marker
- content = [] # current content lines list
- alphanum = string.letters + string.digits + "_"
- self.name = None
+ marker = None # current marker
+ content = [] # current content lines list
+ alphanum = string.letters + string.digits + "_"
+ self.name = None
for line in block_line_list:
line2 = string.lstrip( line )
@@ -645,16 +648,17 @@ class DocBlock:
return item[1]
return None
+
def html_address( self ):
section = self.section
if section and section.filename:
- return section.filename+'#'+self.name
+ return section.filename + '#' + self.name
- return "" # this block is not in a section ??
+ return "" # this block is not in a section?
def location( self ):
- return self.filename + ':' + str(self.lineno)
+ return self.filename + ':' + str( self.lineno )
def dump( self ):
@@ -959,7 +963,8 @@ class DocSectionList:
else:
line = line + 1
else:
- sys.stderr.write( "identifier '"+ident+"' has no definition" + '\n' )
+ sys.stderr.write( "identifier '" + ident +
+ "' has no definition" + '\n' )
print "</tr></table></center>"
print html_footer
@@ -1031,7 +1036,7 @@ def file_exists( pathname ):
def add_new_block( list, filename, lineno, block_lines, source_lines ):
"""add a new block to the list"""
- block = DocBlock( block_lines, source_lines )
+ block = DocBlock( block_lines, source_lines )
block.filename = filename
block.lineno = lineno
list.append( block )
@@ -1046,9 +1051,10 @@ def make_block_list():
for pathname in sys.argv[1:]:
if string.find( pathname, '*' ) >= 0:
newpath = glob.glob( pathname )
- newpath.sort() # sort files, this is important because the order of files
+ newpath.sort() # sort files -- this is important because
+ # of the order of files
else:
- newpath = [ pathname ]
+ newpath = [pathname]
last = len( file_list )
file_list[last:last] = newpath
@@ -1101,7 +1107,8 @@ def make_block_list():
if format >= 4 and l > 2 and line2[0 : 2] == '/*':
if l < 4 or ( line2[3] != '@' and line2[3:4] != ' @' and
line2[3] != '#' and line2[3:4] != ' #'):
- add_new_block( list, fileinput.filename(), lineno, block, source )
+ add_new_block( list, fileinput.filename(),
+ lineno, block, source )
format = 0
if format == 0: #### wait for beginning of comment ####