kc3-lang/ftgl

diff --git a/HISTORY.txt b/HISTORY.txt
index dd293e9..e3a1272 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -1,18 +1,40 @@
-FTGL 1.3b5
-January 27 2002
+FTGL 1.4
+    - Merged 1.32 branch with main tree
+    - Glyph loading has been optimised for pixel based glyphs.
+    - Removed mmgr
+    - Added FTFont::Attach
+    - Updated API docs
+    - removed stl map and vector
+
 
+April 23 2002
+    1.32 (FTGL_1_3_2)
+    - Fixed enable state attribute in FTGLBitmapFont
+    - Wrapped tb.h & trackball.h in EXTERN "C"
+    - Renamed FTGLDemo to .cpp
+    Ellers...
+    - New MSVC projects updated to v1.3
+    - Removed a lot of unnecessary Windows stuff from ftgl.h
+    - Added functions to load font from memory.
+    - Fixed a couple of Windows 'for' scope problems in FTExtrdGlyph
+    - FTGLDemo - Added #define for windows font
+
+January 30 2002
+    1.31 (FTGL_1_3_1)
+    - Forgot to update readme etc for 1.3
+    
+January 27 2002
  	1.3b5 (FTGL_1_3_BETA_5)
 	- FTBbox now uses float rather then int
 	- Fixed some more warnings (size_t)
-	- Removed the contour winding function because it didn't fix the
-	  problem!!
+	- Removed the contour winding function because it didn't fix the problem!!
 	- Fixed up some state settings in fonts.
 
 December 11 2001
  	1.3b4 (FTGL_1_3_BETA_4)
 	- Added MAC OSX project (Project Builder)
-	- Added a function for extruded glyphs that calculates the winding
-	  order of the glyph contour.
+	- Added a function for extruded glyphs that calculates the winding order of
+      the glyph contour.
 	- Added FTGL_DEBUG to include memory debugger.
 	- Added a couple of typedefs to FTGL.h, mainly to aid debugging
 	- Cleaned up the includes.
@@ -20,16 +42,16 @@ December 11 2001
 November 13 2001
  	1.3b3 (FTGL_1_3_BETA_3)
 	- Texture fonts now behave the same as the others and can be loaded on
-	  demand. This made FTGLTextureFont MUCH simpler!!!! It has also
-	  improved the grid fitting so less texture mem is needed.
+      demand. This made FTGLTextureFont MUCH simpler!!!! It has also improved 
+      the grid fitting so less texture mem is needed.
 	- Refactored FTVectoriser...
-	  This now builds contours and meshes internally and then passes the
-	  raw point data onto the glyphs. The gluTess data is captured in an
-	  internal non static data structure fixing a memory Leak in PolyGlyph
-	  (glCombine). This has enabled...
+	  This now builds contours and meshes internally and then passes the raw
+      point data onto the glyphs. The gluTess data is captured in an internal 
+      non static data structure fixing a memory Leak in PolyGlyph (glCombine). 
+      This has enabled...
 	- Extruded fonts. FTGLExtrdFont & FTExtrdGlyph.
-	- Reversed the winding for polyglyphs, extruded glyphs and texture
-	  glyphs to make them CCW
+	- Reversed the winding for polyglyphs, extruded glyphs and texture glyphs to
+      make them CCW
 	- Bounding box function
 	- Fixed the != and == operators in ftPoint
 	- Un-virtualised some functions in FTFont
@@ -43,28 +65,28 @@ November 9 2001
 November 6 2001
  	1.2 (FTGL_1_2_0)
 	- Glyphs can now be loaded on the fly instead of being pre-cached. If
-	  FTFont::Open() is called with false, FTGlyphContainer will build a
-	  list of null pointers. Then when ever a glyph needs to be access eg
-	  by FTFont::advance or FTFont::render, it will be built and slotted
-	  into the glyphlist in the correct position.
-	- Removed glext.h from FTGL.h and replaced it with a test for
-	  GL_EXT_texture_object.
+      FTFont::Open() is called with false, FTGlyphContainer will build a list of 
+      null pointers. Then when ever a glyph needs to be access eg by 
+      FTFont::advance or FTFont::render, it will be built and slotted into the 
+      glyphlist in the correct position.
+	- Removed glext.h from FTGL.h and replaced it with a test for 
+      GL_EXT_texture_object.
 	- Added padding to texture size calculations.
-	- Fixed a NASTY bug in FTGLTextureFont. Only came to light after changes
-	  to the glyph preprocessing.
+	- Fixed a NASTY bug in FTGLTextureFont. Only came to light after changes to
+      the glyph preprocessing.
 
 October 31 2001
  	1.1 (FTGL_1_1_0)
 	- Renamed the source to .cpp
-	- Removed the static activeTextureID from FTTextureGlyph and replaced
-	  it with a call to
-	  glGetIntegerv( GL_TEXTURE_2D_BINDING_EXT, &activeTextureID);
+	- Removed the static activeTextureID from FTTextureGlyph and replaced it
+      with a call to
+      glGetIntegerv( GL_TEXTURE_2D_BINDING_EXT, &activeTextureID);
 	- Added an include for glext.h in FTGL.h
 	- Tidied up the glbegin/glEnd pairs in FTTextureGlyph & FTGLTextureFont
 	- Fixed the problem with doc filenames.
 	- Tidied up some implicit type conversions.
-	- Fixed FTCharMap to ensure that a valid default charmap is always
-	  created by the c_stor.
+	- Fixed FTCharMap to ensure that a valid default charmap is always created
+      by the c_stor.
 	
 October 26 2001
 	1.01 (FTGL_1_0_1)
@@ -91,60 +113,60 @@ September 29 2001
 
 September 20 2001
 	1.0b6 (FTGL_1_0_BETA_6)
-	- Implemented the new FTCharmap class. The performance improvement
-	  is dramatic.
-	- Tidied up the way the freetype FT_Face object is disposed of by
-	  FTFont and FTFace. This was a potential crash.
-	- FTVectorGlyph and FTPolyGlyph now disposes of the freetype glyph
-	  correctly after initialsation. This was a potential crash.
-	- Preliminary support for unicode...wchar_t Tested with non european
-	  fonts.
+	- Implemented the new FTCharmap class. The performance improvement is
+      dramatic.
+	- Tidied up the way the freetype FT_Face object is disposed of by FTFont and
+FTFace. This was a potential crash.
+	- FTVectorGlyph and FTPolyGlyph now disposes of the freetype glyph correctly
+      after initialsation. This was a potential crash.
+	- Preliminary support for unicode...wchar_t Tested with non european fonts.
 	- Added function to calc the advance width of a string.
 	- Minor tidy ups.
 
 August 29 2001
 	1.0b5 (FTGL_1_0_BETA_5)
-	- Settled on integers for FTSize stuff. NOTE the FTGlyph stuff is still
-	  up in the air.
+	- Settled on integers for FTSize stuff. NOTE the FTGlyph stuff is still up
+      in the air.
 	- Fixed the positional stuff.
 	- Added Java Doc comments. NOT COMPLETE
 	- Fixes for linux, mainly to clear warnings.
-	- changed the return type for FTFace::Glyph() from a reference to a
-	  pointer so it can return NULL on failure.
+	- changed the return type for FTFace::Glyph() from a reference to a pointer
+      so it can return NULL on failure.
 	- Related to above...better error handling and reporting in
-	  FTGLXXXFont::MakeGlyphList()
+      FTGLXXXFont::MakeGlyphList()
 	- Fixed a bug in FTVectoriser that was ignoring non printing characters.
-	  This meant that the pen wasn't advanced for spaces etc. It affected
-	  polygon and outline font rendering.
+      This meant that the pen wasn't advanced for spaces etc. It affected
+      polygon and outline font rendering.
 	- Minor tidy ups.
 
 August 21 2001
 	1.0b4
-	- Changed the mode for FT_Load_Glyph to FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP
-	  for outline and polygon fonts & FT_LOAD_NO_HINTING for texture fonts.
-	  Seems to produce better looking glyphs.
-	- FTGLTextureFont can now use multiple textures to render glyphs if
-	  they don't fit within one GL_MAX_TEXTURE_SIZE texture. 
-	- Changed FTSize to use bbox for global width and height. Needs more
-	  work (eg float or int?) and need to check inconsistancies in freetype.
-	- Being more strict with types eg integer indices and sizes are now unsigned.
+	- Changed the mode for FT_Load_Glyph to FT_LOAD_NO_HINTING |
+      FT_LOAD_NO_BITMAP for outline and polygon fonts & FT_LOAD_NO_HINTING for 
+      texture fonts. Seems to produce better looking glyphs.
+	- FTGLTextureFont can now use multiple textures to render glyphs if they
+      don't fit within one GL_MAX_TEXTURE_SIZE texture. 
+	- Changed FTSize to use bbox for global width and height. Needs more work
+      (eg float or int?) and need to check inconsistancies in freetype.
+	- Being more strict with types eg integer indices and sizes are now
+      unsigned.
 
 August 8 2001
 	1.0b3 (FTGL_1_0_BETA_3)
-	- I've made fundamental change to the way the glyphlist is built. This
-	  is to get round the problems I was having with charmaps. At this stage
-	  it is a temporary solution. Previously the glyphList was indexed by
-	  char code. Now it's indexed by glyph index and the conversion is done
-	  by the freetype function FT_Get_Char_Index(). If this proves to be too
-	  slow I'll make my own charmap and use it to index into the glyphlist.
-	  This has fixed all the charmap related problems/bugs.
+	- I've made fundamental change to the way the glyphlist is built. This is to
+      get round the problems I was having with charmaps. At this stage it is a
+      temporary solution. Previously the glyphList was indexed by char code. Now
+      it's indexed by glyph index and the conversion is done by the freetype
+      function FT_Get_Char_Index(). If this proves to be too slow I'll make my
+      own charmap and use it to index into the glyphlist. This has fixed all the
+      charmap related problems/bugs.
 	- Enabled alpha blend in Pixmap font.
 	- Enabled LINE_SMOOTH in Outline font
 	- Fixed bug that prevented the display of chars >127
 	- Moved pixel store stuff out of BitmapGlyph into BitmapFont.
 	- Minor changes for IRIX (compiles but isn't tested)
 	- Pixmap fonts can now be in colour. It uses the current colour when the
-	  font is CREATED. This isn't ideal but is better than the alternatives.
+      font is CREATED. This isn't ideal but is better than the alternatives.
 	- Tidied up the error handling.
 	- Minor code clean ups.
 
@@ -154,8 +176,8 @@ August 6 2001
 	
 August 3 2001
 	First BETA release 1.0b1 (FTGL_1_0_BETA_1)
-	- All font types are now working, Bitmaps, Pixmaps, Texture, Outline
-	  and Polygons. Quality of output and performance varies wildly:)
+	- All font types are now working, Bitmaps, Pixmaps, Texture, Outline and
+      Polygons. Quality of output and performance varies wildly:)
 
 July 22 2001
 	First ALPHA Release 1.0a1
diff --git a/README.txt b/README.txt
index 74bd421..642b865 100755
--- a/README.txt
+++ b/README.txt
@@ -1,5 +1,6 @@
-FTGL 1.31
-January 30 2002
+FTGL 1.32
+April 23 2002
+
 
 DESCRIPTION:
 
@@ -38,7 +39,8 @@ Bezier curve code contributed by Jed Soane.
 Demo, Linux port, extrusion code and gltt maintainance by Gerard Lanois
 Linux port by Matthias Kretz
 Windows port by Max Rheiner & Ellers
-Bug fixes by Robert Osfield & Marcelo E. Magallon
+Bug fixes by Robert Osfield, Marcelo E. Magallon, Markku Rontu
+Sebastiene Barre
 
 Please contact me if you have any suggestions, feature requests, or problems.
 
@@ -78,6 +80,8 @@ Enable access to raw glyph data
 State handling...
 inline base class methods
 
+Extreme Programming...
+
 
 Things to think about...
 
diff --git a/TODO.txt b/TODO.txt
index ee124df..0bb9ed5 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,8 +1,7 @@
-FTGL 1.3b5
-January 27 2002
+FTGL 1.32
+April 23 2002
 
 TODO:
-	- namespace ftgl or gltt?
 	- use float for all font metrics and advance metrics.
 	
 	
diff --git a/mac/FTGL.pbproj/henry.pbxuser b/mac/FTGL.pbproj/henry.pbxuser
index ace2f35..3829ef0 100644
Binary files a/mac/FTGL.pbproj/henry.pbxuser and b/mac/FTGL.pbproj/henry.pbxuser differ
diff --git a/mac/FTGL.pbproj/project.pbxproj b/mac/FTGL.pbproj/project.pbxproj
index 0181440..6dcbf58 100644
Binary files a/mac/FTGL.pbproj/project.pbxproj and b/mac/FTGL.pbproj/project.pbxproj differ