--- parser3/src/classes/image.C	2002/11/25 14:57:32	1.82
+++ parser3/src/classes/image.C	2002/11/28 12:23:39	1.87
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_IMAGE_C="$Date: 2002/11/25 14:57:32 $";
+static const char* IDENT_IMAGE_C="$Date: 2002/11/28 12:23:39 $";
 
 /*
 	jpegsize: gets the width and height (in pixels) of a jpeg file
@@ -212,7 +212,7 @@ inline uint endian_to_uint(bool is_big,
 static void measure_gif(Pool& pool, const String *origin_string, 
 			 Measure_reader& reader, ushort& width, ushort& height) {
 
-	void *buf;
+	const void *buf;
 	const int head_size=sizeof(GIF_Header);
 	if(reader.read(buf, head_size)<head_size)
 		throw Exception("image.format", 
@@ -456,7 +456,7 @@ static void measure_jpeg(Pool& pool, con
 	const uchar CODE_SIZE_D=0xC3;
 	const uchar CODE_EXIF=0xE1;
 
-	void *buf;
+	const void *buf;
 	const size_t prefix_size=2;
 	if(reader.read(buf, prefix_size)<prefix_size)
 		throw Exception("image.format", 
@@ -517,7 +517,7 @@ static void measure_jpeg(Pool& pool, con
 static void measure_png(Pool& pool, const String *origin_string, 
 			 Measure_reader& reader, ushort& width, ushort& height) {
 
-	void *buf;
+	const void *buf;
 	const int head_size=sizeof(PNG_Header);
 	if(reader.read(buf, head_size)<head_size)
 		throw Exception("image.format", 
@@ -891,10 +891,10 @@ static void _polybar(Request& r, const S
 
 // font
 
-#define Y(y)(y+index*height+1)
+#define Y(y)(y+index*height)
 
 /// simple gdImage-based font storage & text output 
-class Font : public Pooled {
+class Font: public Pooled {
 public:
 	
 	const static int letter_spacing;
@@ -906,7 +906,7 @@ public:
 	
 	Font(Pool& pool, 
 		const String& aalphabet, 
-		gdImage& aifont, int aheight, int amonospace, int aspacebarspace) : Pooled(pool), 
+		gdImage& aifont, int aheight, int amonospace, int aspacebarspace): Pooled(pool), 
 		alphabet(aalphabet), 
 		height(aheight), monospace(amonospace),  spacebarspace(aspacebarspace),
 		ifont(aifont) {
@@ -924,7 +924,7 @@ public:
 			return spacebarspace;
 		int tr=ifont.GetTransparent();
 		for(int x=ifont.SX()-1; x>=0; x--) {
-			for(int y=0; y<height-1; y++)
+			for(int y=0; y<height; y++)
 				if(ifont.GetPixel(x, Y(y))!=tr) 
 					return x+1;
 		}
@@ -933,16 +933,21 @@ public:
 	
 	void index_display(gdImage& image, int x, int y, int index){
 		if(index>=0) 
-			ifont.Copy(image, x, y, 0, Y(0), index_width(index), height-1);
+			ifont.Copy(image, x, y, 0, Y(0), index_width(index), height);
 	}
 	
 	/* ******************************** string ********************************** */
 	
+	int step_width(int index) {
+		return letter_spacing + (monospace ? monospace : index_width(index));
+	}
+
+	// counts trailing letter_spacing, consider this OK. useful for contiuations
 	int string_width(const String& s){
 		const char *cstr=s.cstr();
 		int result=0;
 		for(; *cstr; cstr++)
-			result+=index_width(index_of(*cstr));
+			result+=step_width(index_of(*cstr));
 		return result;
 	}
 	
@@ -951,7 +956,7 @@ public:
 		if(cstr) for(; *cstr; cstr++) {
 			int index=index_of(*cstr);
 			index_display(image, x, y, index);
-			x+=letter_spacing + (monospace ? monospace : index_width(index));
+			x+=step_width(index);
 		}
 	}
 	
@@ -976,6 +981,12 @@ static void _font(Request& r, const Stri
 		throw Exception("parser.runtime",
 			&method_name,
 			"alphabet must not be empty");
+
+	if(int remainder=image.SY() % alphabet.size())
+		throw Exception("parser.runtime",
+			&method_name,
+			"font-file height(%d) not divisable by alphabet size(%d), remainder=%d",
+				image.SY(), alphabet.size(), remainder);
 	
 	static_cast<VImage *>(r.get_self())->font=new(pool) Font(pool, 
 		alphabet,