include/rays/font.h in rays-0.1.3 vs include/rays/font.h in rays-0.1.4

@@ -2,12 +2,12 @@
 #pragma once
 #ifndef __RAYS_FONT_H__
 #define __RAYS_FONT_H__
 
 
+#include <xot/pimpl.h>
 #include <rays/defs.h>
-#include <rays/helpers.h>
 
 
 namespace Rays
 {
 
@@ -25,18 +25,22 @@
 
 			String name () const;
 
 			coord size () const;
 
-			bool get_extent (coord* width, coord* height, const char* str) const;
+			bool get_width (coord* width, const char* str) const;
 
+			bool get_height (
+				coord* height,
+				coord* ascent = NULL, coord* descent = NULL, coord* leading = NULL) const;
+
 			operator bool () const;
 
 			bool operator ! () const;
 
 			struct Data;
 
-			Impl<Data> self;
+			Xot::PImpl<Data, true> self;
 
 	};// Font
 
 
 	const Font& default_font ();