Commit 241a40fc57c334212bd2628c753ff6811e37c58d

henry 2001-08-28T23:04:04

Moved the list of valid encoding symbols from the .cc to .h so it appears in the docs.

diff --git a/include/FTFace.h b/include/FTFace.h
index 1c9494b..8e564bb 100755
--- a/include/FTFace.h
+++ b/include/FTFace.h
@@ -45,7 +45,6 @@ class	FTFace
 		 */
 		void Close();
 		
-
 		/**
 		 * Sets the char size for the current face.
 		 *
@@ -60,10 +59,24 @@ class	FTFace
 
 		/**
 		 * Sets the character map for the face.
+		 * Valid encodings as at Freetype 2.0.4
+		 *		ft_encoding_none
+		 *		ft_encoding_symbol
+		 *		ft_encoding_unicode
+		 *		ft_encoding_latin_2
+		 *		ft_encoding_sjis
+		 *		ft_encoding_gb2312
+		 *		ft_encoding_big5
+		 *		ft_encoding_wansung
+		 *		ft_encoding_johab
+		 *		ft_encoding_adobe_standard
+		 *		ft_encoding_adobe_expert
+		 *		ft_encoding_adobe_custom
+		 *		ft_encoding_apple_roman
 		 *
-		 * @param encoding		XXXXXXX
-		 * @return				<code>true</code> if charmap was valid and
-		 *						set correctly
+		 * @param encoding		the Freetype encoding symbol. See above.
+		 * @return				<code>true</code> if charmap was valid
+		 *						and set correctly
 		 */
 		bool CharMap( FT_Encoding encoding);
 
diff --git a/src/FTFace.cpp b/src/FTFace.cpp
index 8be3cd0..919b01f 100755
--- a/src/FTFace.cpp
+++ b/src/FTFace.cpp
@@ -58,19 +58,6 @@ FTSize& FTFace::Size( const unsigned int size, const unsigned int res )
 
 bool FTFace::CharMap( FT_Encoding encoding )
 {
-// 	ft_encoding_none, 0, 0, 0, 0
-// 	ft_encoding_symbol,  's', 'y', 'm', 'b'
-// 	ft_encoding_unicode, 'u', 'n', 'i', 'c'
-// 	ft_encoding_latin_2, 'l', 'a', 't', '2'
-// 	ft_encoding_sjis,    's', 'j', 'i', 's'
-// 	ft_encoding_gb2312,  'g', 'b', ' ', ' '
-// 	ft_encoding_big5,    'b', 'i', 'g', '5'
-// 	ft_encoding_wansung, 'w', 'a', 'n', 's'
-// 	ft_encoding_johab,   'j', 'o', 'h', 'a'
-// 	ft_encoding_adobe_standard, 'A', 'D', 'O', 'B'
-// 	ft_encoding_adobe_expert,   'A', 'D', 'B', 'E'
-// 	ft_encoding_adobe_custom,   'A', 'D', 'B', 'C'
-// 	ft_encoding_apple_roman, 'a', 'r', 'm', 'n'
 	
 // 	FT_CharMap  found = 0;
 //     FT_CharMap  charmap;