minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

formatting

This commit is contained in:
Werner Lemberg 2001-01-15 23:11:55 +00:00
parent db0717879f
commit 9e708eb5fb
2 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -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 * src/pcd/pcfread.c: Removed some compilation warnings related
to comparison of signed vs. unsigned integers 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 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> 2001-01-11 Matthew Crosby <mcrosby@marthon.org>

65
docs/docmaker.py
View File

@ -247,15 +247,16 @@ class DocParagraph:
alphanum = string.lowercase + string.uppercase + string.digits + '_' alphanum = string.lowercase + string.uppercase + string.digits + '_'
for word in self.words: for word in self.words:
# process cross references if needed
# process cross references when needed #
if identifiers and word and word[0] == '@': if identifiers and word and word[0] == '@':
word = word[1:] word = word[1:]
# we need to find non alpha numeric charaters # we need to find non-alphanumeric characters
i = len(word) #
while i > 0 and not word[i-1] in alphanum: i = len( word )
i = i-1 while i > 0 and not word[i - 1] in alphanum:
i = i - 1
if i > 0: if i > 0:
extra = word[i:] extra = word[i:]
@ -263,27 +264,29 @@ class DocParagraph:
block = identifiers.get( word ) block = identifiers.get( word )
if block: if block:
word = '<a href="'+block.html_address()+'">' + word + '</a>' word = '<a href="' + block.html_address() + '">' + word + '</a>'
else: else:
word = '?'+word word = '?' + word
if cursor + len( word ) + 1 > max_width: if cursor + len( word ) + 1 > max_width:
print line print line
cursor = 0 cursor = 0
line = "" line = ""
line = line + word line = line + word
if not extra: if not extra:
line = line + " " line = line + " "
cursor = cursor + len( word ) + 1 cursor = cursor + len( word ) + 1
# handle trailing periods, commas, etc.. at the end of # handle trailing periods, commas, etc. at the end of
# cross references.. # cross references.
#
if extra: if extra:
if cursor + len( extra ) + 1 > max_width: if cursor + len( extra ) + 1 > max_width:
print line print line
cursor = 0 cursor = 0
line = "" line = ""
line = line + extra + " " line = line + extra + " "
cursor = cursor + len( extra ) + 1 cursor = cursor + len( extra ) + 1
@ -562,15 +565,15 @@ class DocContent:
class DocBlock: class DocBlock:
def __init__( self, block_line_list = [], source_line_list = [] ): def __init__( self, block_line_list = [], source_line_list = [] ):
self.items = [] # current ( marker, contents ) list self.items = [] # current ( marker, contents ) list
self.section = None # section this block belongs to self.section = None # section this block belongs to
self.filename = "unknown" # filename defining this block self.filename = "unknown" # filename defining this block
self.lineno = 0 # line number in filename self.lineno = 0 # line number in filename
marker = None # current marker marker = None # current marker
content = [] # current content lines list content = [] # current content lines list
alphanum = string.letters + string.digits + "_" alphanum = string.letters + string.digits + "_"
self.name = None self.name = None
for line in block_line_list: for line in block_line_list:
line2 = string.lstrip( line ) line2 = string.lstrip( line )
@ -645,16 +648,17 @@ class DocBlock:
return item[1] return item[1]
return None return None
def html_address( self ): def html_address( self ):
section = self.section section = self.section
if section and section.filename: 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 ): def location( self ):
return self.filename + ':' + str(self.lineno) return self.filename + ':' + str( self.lineno )
def dump( self ): def dump( self ):
@ -959,7 +963,8 @@ class DocSectionList:
else: else:
line = line + 1 line = line + 1
else: else:
sys.stderr.write( "identifier '"+ident+"' has no definition" + '\n' ) sys.stderr.write( "identifier '" + ident +
"' has no definition" + '\n' )
print "</tr></table></center>" print "</tr></table></center>"
print html_footer print html_footer
@ -1031,7 +1036,7 @@ def file_exists( pathname ):
def add_new_block( list, filename, lineno, block_lines, source_lines ): def add_new_block( list, filename, lineno, block_lines, source_lines ):
"""add a new block to the list""" """add a new block to the list"""
block = DocBlock( block_lines, source_lines ) block = DocBlock( block_lines, source_lines )
block.filename = filename block.filename = filename
block.lineno = lineno block.lineno = lineno
list.append( block ) list.append( block )
@ -1046,9 +1051,10 @@ def make_block_list():
for pathname in sys.argv[1:]: for pathname in sys.argv[1:]:
if string.find( pathname, '*' ) >= 0: if string.find( pathname, '*' ) >= 0:
newpath = glob.glob( pathname ) 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: else:
newpath = [ pathname ] newpath = [pathname]
last = len( file_list ) last = len( file_list )
file_list[last:last] = newpath file_list[last:last] = newpath
@ -1101,7 +1107,8 @@ def make_block_list():
if format >= 4 and l > 2 and line2[0 : 2] == '/*': if format >= 4 and l > 2 and line2[0 : 2] == '/*':
if l < 4 or ( line2[3] != '@' and line2[3:4] != ' @' and if l < 4 or ( line2[3] != '@' and line2[3:4] != ' @' and
line2[3] != '#' and line2[3:4] != ' #'): 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 format = 0
if format == 0: #### wait for beginning of comment #### if format == 0: #### wait for beginning of comment ####