Merging XORG-CURRENT into trunk

1 files changed, 41 insertions, 61 deletions

diff --git a/man/XLoadFont.man b/man/XLoadFont.man
index b9f96d3a..cb7a3873 100644
--- a/man/XLoadFont.man
+++ b/man/XLoadFont.man
@@ -40,6 +40,9 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
+.\" $XFree86: xc/doc/man/X11/XLoadFont.man,v 1.3 2003/04/28 22:17:55 herrb Exp $
+.\" $XdotOrg: lib/X11/man/XLoadFont.man,v 1.2 2004-04-23 18:42:09 eich Exp $
+.\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
 .ds xL Xlib \- C Language X Interface
@@ -138,47 +141,24 @@
 .el .sp 10p
 ..
 .ny0
-.TH XLoadFont 3X11 "Release 6.6" "X Version 11" "XLIB FUNCTIONS"
+.TH XLoadFont 3X11 __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
 XLoadFont, XQueryFont, XLoadQueryFont, XFreeFont, XGetFontProperty, XUnloadFont, XCharStruct, XFontProp, XChar2b, XFontStruct \- load or unload fonts and font metric structures
 .SH SYNTAX
-Font XLoadFont\^(\^\fIdisplay\fP, \fIname\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      char *\fIname\fP\^;
-.LP
-XFontStruct *XQueryFont\^(\^\fIdisplay\fP, \fIfont_ID\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XID \fIfont_ID\fP\^;
-.LP
-XFontStruct *XLoadQueryFont\^(\^\fIdisplay\fP, \fIname\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      char *\fIname\fP\^;
-.LP
-XFreeFont\^(\^\fIdisplay\fP, \fIfont_struct\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      XFontStruct *\fIfont_struct\fP\^;
-.LP
-Bool XGetFontProperty\^(\^\fIfont_struct\fP\^, \^\fIatom\fP\^, \^\fIvalue_return\fP\^)
-.br
-      XFontStruct *\fIfont_struct\fP\^;
-.br
-      Atom \fIatom\fP\^;
-.br
-      unsigned long *\fIvalue_return\fP\^;
-.LP
-XUnloadFont\^(\^\fIdisplay\fP, \fIfont\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Font \fIfont\fP\^;
+.HP
+Font XLoadFont\^(\^Display *\fIdisplay\fP\^, char *\fIname\fP\^); 
+.HP
+XFontStruct *XQueryFont\^(\^Display *\fIdisplay\fP\^, XID \fIfont_ID\fP\^); 
+.HP
+XFontStruct *XLoadQueryFont\^(\^Display *\fIdisplay\fP\^, char
+*\fIname\fP\^); 
+.HP
+int XFreeFont\^(\^Display *\fIdisplay\fP\^, XFontStruct *\fIfont_struct\fP\^);
+.HP
+Bool XGetFontProperty\^(\^XFontStruct *\fIfont_struct\fP\^, Atom \fIatom\fP\^,
+unsigned long *\fIvalue_return\fP\^); 
+.HP
+int XUnloadFont\^(\^Display *\fIdisplay\fP\^, Font \fIfont\fP\^); 
 .SH ARGUMENTS
 .IP \fIatom\fP 1i
 Specifies the atom for the property name you want returned.
@@ -333,12 +313,12 @@ structures contain:
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	short lbearing;	/* origin to left edge of raster */
-	short rbearing;	/* origin to right edge of raster */
-	short width;	/* advance to next char's origin */
-	short ascent;	/* baseline to top edge of raster */
-	short descent;	/* baseline to bottom edge of raster */
-	unsigned short attributes;	/* per char flags (not predefined) */
+	short lbearing;	/\(** origin to left edge of raster */
+	short rbearing;	/\(** origin to right edge of raster */
+	short width;	/\(** advance to next char's origin */
+	short ascent;	/\(** baseline to top edge of raster */
+	short descent;	/\(** baseline to bottom edge of raster */
+	unsigned short attributes;	/\(** per char flags (not predefined) */
 } XCharStruct;
 .De
 .LP
@@ -356,7 +336,7 @@ typedef struct {
 .Ds 0
 .TA .5i 3i
 .ta .5i 3i
-typedef struct {	/* normal 16 bit characters are two bytes */
+typedef struct {	/\(** normal 16 bit characters are two bytes */
     unsigned char byte1;
     unsigned char byte2;
 } XChar2b;
@@ -367,22 +347,22 @@ typedef struct {	/* normal 16 bit characters are two bytes */
 .TA .5i 3i
 .ta .5i 3i
 typedef struct {
-	XExtData *ext_data;	/* hook for extension to hang data */
-	Font fid;	/* Font id for this font */
-	unsigned direction;	/* hint about the direction font is painted */
-	unsigned min_char_or_byte2;	/* first character */
-	unsigned max_char_or_byte2;	/* last character */
-	unsigned min_byte1;	/* first row that exists */
-	unsigned max_byte1;	/* last row that exists */
-	Bool all_chars_exist;	/* flag if all characters have nonzero size */
-	unsigned default_char;	/* char to print for undefined character */
-	int n_properties;	/* how many properties there are */
-	XFontProp *properties;	/* pointer to array of additional properties */
-	XCharStruct min_bounds;	/* minimum bounds over all existing char */
-	XCharStruct max_bounds;	/* maximum bounds over all existing char */
-	XCharStruct *per_char;	/* first_char to last_char information */
-	int ascent;	/* logical extent above baseline for spacing */
-	int descent;	/* logical decent below baseline for spacing */
+	XExtData *ext_data;	/\(** hook for extension to hang data */
+	Font fid;	/\(** Font id for this font */
+	unsigned direction;	/\(** hint about the direction font is painted */
+	unsigned min_char_or_byte2;	/\(** first character */
+	unsigned max_char_or_byte2;	/\(** last character */
+	unsigned min_byte1;	/\(** first row that exists */
+	unsigned max_byte1;	/\(** last row that exists */
+	Bool all_chars_exist;	/\(** flag if all characters have nonzero size */
+	unsigned default_char;	/\(** char to print for undefined character */
+	int n_properties;	/\(** how many properties there are */
+	XFontProp *properties;	/\(** pointer to array of additional properties */
+	XCharStruct min_bounds;	/\(** minimum bounds over all existing char */
+	XCharStruct max_bounds;	/\(** maximum bounds over all existing char */
+	XCharStruct *per_char;	/\(** first_char to last_char information */
+	int ascent;	/\(** logical extent above baseline for spacing */
+	int descent;	/\(** logical decent below baseline for spacing */
 } XFontStruct;
 .De
 .LP