Commit 65d328ead72f934c98243a0da5cfd70b9424e5bf

Werner Lemberg 2001-02-03T03:00:06

formatting, ChangeLog entry

diff --git a/ChangeLog b/ChangeLog
index 145fda3..6d7ae8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,19 +1,24 @@
 2001-02-01  David Turner  <david.turner@freetype.org>
 
-	* docs/docmaker.py: improved the index sorting routine to place capital
-	letters before small ones. added the "<order>" marker to section blocks
-	in order to give the order of blocks
+	* docs/docmaker.py: Improved the index sorting routine to place
+	capital letters before small ones.  Added the "<order>" marker to
+	section blocks in order to give the order of blocks.
+
+2001-01-30  Antoine Leca  <Antoine.Leca@renault.fr>
+
+	* include/freetype/ttnameid.h: Latest updates to Microsoft language
+	ID codes.
 
 2001-01-24  Tom Kacvinsky  <tjk@ams.org>
 
 	* src/cff/t1load.c (parse_font_matrix): Added heuristic to get
 	units_per_EM from the font matrix.
 
-        (parse_dict): Deleted test to see if the FontInfo keyword has been
-	seen.  Deletion of this test allows fonts without FontInfo
+	(parse_dict): Deleted test to see whether the FontInfo keyword has
+	been seen.  Deletion of this test allows fonts without FontInfo
 	dictionaries to be parsed by the Type 1 driver.
 
-	(T1_Open_Face): deleted empty subroutines array test to make sure
+	(T1_Open_Face): Deleted empty subroutines array test to make sure
 	fonts with no subroutines still are parsed.
 
 2001-01-17  Francesco Zappa Nardelli  <francesco.zappa.nardelli@ens.fr>
diff --git a/docs/docmaker.py b/docs/docmaker.py
index f02bdc0..592731d 100644
--- a/docs/docmaker.py
+++ b/docs/docmaker.py
@@ -59,23 +59,22 @@ source_footer = "</pre></table></center><br>"
 current_section = None
 
 
-# this function is used to sort the index. it's a simple lexicographical
-# sort, except that it places capital letters before small ones
+# This function is used to sort the index.  It's a simple lexicographical
+# sort, except that it places capital letters before small ones.
 #
 def index_sort( s1, s2 ):
-
     if not s1:
         return -1
 
     if not s2:
         return 1
 
-    l1 = len(s1)
-    l2 = len(s2)
-    m1 = string.lower(s1)
-    m2 = string.lower(s2)
+    l1 = len( s1 )
+    l2 = len( s2 )
+    m1 = string.lower( s1 )
+    m2 = string.lower( s2 )
 
-    for i in range(l1):
+    for i in range( l1 ):
         if i >= l2 or m1[i] > m2[i]:
             return 1
         
@@ -921,12 +920,14 @@ class DocSectionList:
             else:
                 section.title = "UNKNOWN_SECTION_TITLE!"
 
-        # sort section elements according to the <order> marker when
+        # sort section elements according to the <order> marker if
         # available
+        #
         for section in self.sections.values():
             order = section.block.find_content( "order" )
             if order:
-                #sys.stderr.write( "<order> found at "+section.block.location()+'\n' )
+                # sys.stderr.write( "<order> found at "
+                #                   + section.block.location() + '\n' )
                 order_list = []
                 for item in order.items:
                     for element in item[1]:
@@ -934,9 +935,10 @@ class DocSectionList:
                         try:
                             words = element.get_words()
                         except:
-                            sys.stderr.write( "WARNING:" +
-                                              section.block.location() +
-                                              ": invalid content in <order> marker\n" )
+                            sys.stderr.write(
+                              "WARNING:" +
+                              section.block.location() +
+                              ": invalid content in <order> marker\n" )
                         if words:
                             for word in words:
                                 block = self.identifiers.get( word )
@@ -944,13 +946,18 @@ class DocSectionList:
                                     if block.section == section:
                                         order_list.append( word )
                                     else:
-                                        sys.stderr.write( "WARNING:" +
-                                                          section.block.location() +
-                                                          ": invalid reference to '"+word+"' defined in other section\n" )
+                                        sys.stderr.write(
+                                          "WARNING:" +
+                                          section.block.location() +
+                                          ": invalid reference to '" +
+                                          word +
+                                          "' defined in other section\n" )
                                 else:
-                                    sys.stderr.write( "WARNING:" +
-                                                      section.block.location() +
-                                                      ": invalid reference to '"+word+"'\n" )
+                                    sys.stderr.write(
+                                      "WARNING:" +
+                                      section.block.location() +
+                                      ": invalid reference to '" +
+                                      word + "'\n" )
                                 
                 # now sort the list of blocks according to the order list
                 #
@@ -1056,7 +1063,6 @@ class DocSectionList:
 
 
 
-
 # Filter a given list of DocBlocks. Returns a new list
 # of DocBlock objects that only contains element whose
 # "type" (i.e. first marker) is in the "types" parameter.
@@ -1131,7 +1137,7 @@ def make_block_list():
     """parse a file and extract comments blocks from it"""
 
     file_list = []
-    #sys.stderr.write( repr( sys.argv[1:] ) + '\n' )
+    # sys.stderr.write( repr( sys.argv[1:] ) + '\n' )
 
     for pathname in sys.argv[1:]:
         if string.find( pathname, '*' ) >= 0:
diff --git a/include/freetype/fttypes.h b/include/freetype/fttypes.h
index 9dbf338..e95d848 100644
--- a/include/freetype/fttypes.h
+++ b/include/freetype/fttypes.h
@@ -49,19 +49,6 @@ FT_BEGIN_HEADER
   /*    FT_Byte FT_Char FT_Int FT_UInt FT_Short FT_UShort FT_Long          */
   /*    FT_ULong FT_Fixed FT_Pointer FT_Vector FT_Matrix FT_BBox           */
   /*                                                                       */
-  /*                                                                       */
-  /*                                                                       */
-  /*                                                                       */
-  /*                                                                       */
-  /*                                                                       */
-  /*                                                                       */
-  /*                                                                       */
-  /*                                                                       */
-  /*                                                                       */
-  /*                                                                       */
-  /*                                                                       */
-  /*                                                                       */
-  /*                                                                       */
   /*************************************************************************/