libfontenc xserver pixman mesa git update 5 Mar 2012

font-util-1.3.0
xclock-1.0.6
libXfont-1.4.5
inputproto-2.2

2 files changed, 62 insertions, 105 deletions

diff --git a/libXfont/doc/Makefile.in b/libXfont/doc/Makefile.in
index 0e5814c46..d0cc41e67 100644
--- a/libXfont/doc/Makefile.in
+++ b/libXfont/doc/Makefile.in
@@ -52,8 +52,9 @@ build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(am__dist_noinst_DATA_DIST) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/devbook.am
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps)
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt)
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html)
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt)
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps)
 subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -87,6 +88,7 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BASE_CFLAGS = @BASE_CFLAGS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -229,30 +231,23 @@ top_srcdir = @top_srcdir@
 @ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@docbook = fontlib.xml
 
 # Developers documnetation is not installed
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@noinst_DATA = $(docbook:.xml=.html) \
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@noinst_DATA =  \
 @ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_1) \
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_2)
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_2) \
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_3)
 
 # DocBook/XML file with chapters, appendix and images it includes
 @ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@dist_noinst_DATA = $(docbook) $(chapters)
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--searchpath "$(XORG_SGML_PATH)/X11" 		\
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--searchpath "$(abs_top_builddir)"		\
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
 
-#
-# Generate DocBook/XML output formats with or without stylesheets
-#
-
-# Stylesheets are available if the package xorg-sgml-doctools is installed
-
-# The location where all cross reference databases are installed
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = \
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--searchpath "$(XORG_SGML_PATH)/X11"	\
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam current.docid="$(<:.xml=)"
-
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_XHTML_FLAGS = \
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-m $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
-
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-m $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--searchpath "$(XORG_SGML_PATH)/X11" 		\
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--searchpath "$(abs_top_builddir)"		\
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	--stringparam img.src.path=$(abs_builddir)/	\
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	-x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
 
 @ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(noinst_DATA)
 all: all-am
@@ -440,14 +435,14 @@ uninstall-am:
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml  $(chapters)
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $<
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters)
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop pdf $<
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters)
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop ps $<
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters)
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) txt $<
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml  $(chapters)
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $<
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters)
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $<
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters)
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters)
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $<
 
 # Generate DocBook/XML output formats with or without stylesheets
 
diff --git a/libXfont/doc/fontlib.xml b/libXfont/doc/fontlib.xml
index cce83e9bd..c5079c884 100644
--- a/libXfont/doc/fontlib.xml
+++ b/libXfont/doc/fontlib.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-            "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" >
+            "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+]>
 <!-- lifted from troff+ms by doclifter -->
 <!-- previous version was in xorg-docs/specs/Xserver/fontlib.ms -->
 
@@ -15,7 +18,6 @@
       <title>
 	The X Font Library
       </title>
-      <pubdate>July 27, 1991</pubdate>
       <authorgroup>
 	<author>
 	  <firstname>Keith</firstname>
@@ -32,11 +34,11 @@
 	  </affiliation>
 	</author>
       </authorgroup>
+      <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+      <copyright><year>1993</year><holder>Network Computing Devices</holder></copyright>
+
       <legalnotice>
 	<para>
-	  Copyright 1993 <orgname>Network Computing Devices</orgname>
-	</para>
-	<para>
 	  Permission to use, copy, modify, distribute, and sell this
 	  software and its documentation for any purpose is hereby
 	  granted without fee, provided that the above copyright
@@ -50,8 +52,8 @@
 	  any purpose.  It is provided &ldquo;as is&rdquo; without
 	  express or implied warranty.
 	</para>
-	<para>
-	  Copyright 1993, 1994 <orgname>X Consortium</orgname>
+	<para role="multiLicensing">
+	  Copyright &copy; 1993, 1994 X Consortium
 	</para>
 	<para>
 	  Permission is hereby granted, free of charge, to any person
@@ -80,7 +82,9 @@
 	  promote the sale, use or other dealings in this Software
 	  without prior written authorization from the X Consortium.
 	</para>
+        <para>X Window System is a trademark of The Open Group.</para>
       </legalnotice>
+      <pubdate>July 27, 1991</pubdate>
     </articleinfo>
 
     <warning>
@@ -136,10 +140,8 @@
       source code, so have a listing handy.
     </para>
 
-    <sect1 id='requirements_for_the_font_library'>
-      <title>
-	Requirements for the Font library
-      </title>
+    <sect1 id='Requirements_for_the_Font_library'>
+<title>Requirements for the Font library</title>
 
       <para>
 	To avoid miles of duplicate code in the X server, the font server
@@ -177,10 +179,8 @@
 
     </sect1>
 
-    <sect1 id='general_font_library_interface_details'>
-      <title>
-	General Font Library Interface details.
-      </title>
+    <sect1 id='General_Font_Library_Interface_details'>
+<title>General Font Library Interface details.</title>
 
       <para>
 	To avoid collision between the #define name space for errors, the Font
@@ -209,10 +209,8 @@
 
     </sect1>
 
-    <sect1 id='font_path_elements'>
-      <title>
-	Font Path Elements
-      </title>
+    <sect1 id='Font_Path_Elements'>
+<title>Font Path Elements</title>
 
       <para>
 	At the center of the general font access methods used by X and
@@ -269,9 +267,7 @@ typedef struct _FPEFunctions {
       </para>
 
       <sect2 id='name_check'>
-	<title>
-	  (*name_check)
-	</title>
+	<title>(*name_check)</title>
 
 	<para>
 	  Each new font path member is passed to this function; if
@@ -286,9 +282,7 @@ typedef struct _FPEFunctions {
       </sect2>
 
       <sect2 id='init_fpe'>
-	<title>
-	  (*init_fpe)
-	</title>
+	<title>(*init_fpe)</title>
 
 	<para>
 	  Initialize a new font path element.  This function prepares
@@ -305,9 +299,7 @@ typedef struct _FPEFunctions {
       </sect2>
 
       <sect2 id='reset_fpe'>
-	<title>
-	  (*reset_fpe)
-	</title>
+	<title>(*reset_fpe)</title>
 
 	<para>
 	  When the X font path is reset, and some of the new members
@@ -324,9 +316,7 @@ typedef struct _FPEFunctions {
       </sect2>
 
       <sect2 id='free_fpe'>
-	<title>
-	  (*free_fpe)
-	</title>
+	<title>(*free_fpe)</title>
 
 	<para>
 	  When the server is finished with an FPE, this function is
@@ -337,9 +327,7 @@ typedef struct _FPEFunctions {
       </sect2>
 
       <sect2 id='open_font'>
-	<title>
-	  (*open_font)
-	</title>
+	<title>(*open_font)</title>
 
 	<para>
 	  This routine requests that a font be opened.  The <parameter
@@ -375,9 +363,7 @@ typedef struct _FPEFunctions {
       </sect2>
 
       <sect2 id='close_font'>
-	<title>
-	  (*close_font)
-	</title>
+	<title>(*close_font)</title>
 
 	<para>
 	  When the server is finished with a font, this routine
@@ -387,9 +373,7 @@ typedef struct _FPEFunctions {
       </sect2>
 
       <sect2 id='list_fonts'>
-	<title>
-	  (*list_fonts)
-	</title>
+	<title>(*list_fonts)</title>
 
 	<para>
 	  The <parameter class='function'>paths</parameter> argument is
@@ -402,9 +386,7 @@ typedef struct _FPEFunctions {
       </sect2>
 
       <sect2 id='start_list_fonts_with_info'>
-	<title>
-	  (*start_list_fonts_with_info)
-	</title>
+	<title>(*start_list_fonts_with_info)</title>
 
 	<para>
 	  This routine sets any internal state for a verbose listing of
@@ -414,9 +396,7 @@ typedef struct _FPEFunctions {
       </sect2>
 
       <sect2 id='list_next_font_with_info'>
-	<title>
-	  (*list_next_font_with_info)
-	</title>
+	<title>(*list_next_font_with_info)</title>
 
 	<para>
 	  To avoid storing huge amounts of data, the interface for
@@ -442,9 +422,7 @@ typedef struct _FPEFunctions {
       </sect2>
 
       <sect2 id='wakeup_fpe'>
-	<title>
-	  (*wakeup_fpe)
-	</title>
+	<title>(*wakeup_fpe)</title>
 
 	<para>
 	  Whenever an FPE function has returned
@@ -458,9 +436,7 @@ typedef struct _FPEFunctions {
       </sect2>
 
       <sect2 id='client_died'>
-	<title>
-	  (*client_died)
-	</title>
+	<title>(*client_died)</title>
 
 	<para>
 	  When an FPE function has returned <errorname>Suspended</errorname>
@@ -471,10 +447,8 @@ typedef struct _FPEFunctions {
       </sect2>
     </sect1>
 
-    <sect1 id='fonts'>
-      <title>
-	Fonts
-      </title>
+    <sect1 id='Fonts'>
+<title>Fonts</title>
 
       <para>
 	The data structure which actually contains the font information has
@@ -576,9 +550,7 @@ typedef struct _Font {
       </para>
 
       <sect2 id='get_glyphs'>
-	<title>
-	  (*get_glyphs)
-	</title>
+	<title>(*get_glyphs)</title>
 
 	<para>
 	  This routine returns <structname>CharInfoPtrs</structname>
@@ -592,9 +564,7 @@ typedef struct _Font {
       </sect2>
 
       <sect2 id='get_metrics'>
-	<title>
-	  (*get_metrics)
-	</title>
+	<title>(*get_metrics)</title>
 
 	<para>
 	  This is similar to <structfield>(*get_glyphs)</structfield>
@@ -604,10 +574,8 @@ typedef struct _Font {
 	</para>
       </sect2>
 
-      <sect2 id='getbitmaps'>
-	<title>
-	  (*get_bitmaps)
-	</title>
+      <sect2 id='get_bitmaps'>
+<title>(*get_bitmaps)</title>
 
 	<para>
 	  This packs the glyph image data in the requested
@@ -618,9 +586,7 @@ typedef struct _Font {
       </sect2>
 
       <sect2 id='get_extents'>
-	<title>
-	  (*get_extents)
-	</title>
+	<title>(*get_extents)</title>
 
 	<para>
 	  This returns the metrics for the specified font from the
@@ -630,9 +596,7 @@ typedef struct _Font {
       </sect2>
 
       <sect2 id='unload_font'>
-	<title>
-	  (*unload_font)
-	</title>
+	<title>(*unload_font)</title>
 
 	<para>
 	  This is called from the FPE routine
@@ -641,10 +605,8 @@ typedef struct _Font {
 	</para>
       </sect2>
 
-      <sect2 id='maxprivate'>
-	<title>
-	  maxPrivate
-	</title>
+      <sect2 id='maxPrivate'>
+<title>maxPrivate</title>
 
 	<para>
 	  When initializing a new font structure,