From ffe218bbb0ffa6d2a7f7cbf6b1f81797e667183a Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 5 Mar 2012 09:59:38 +0100 Subject: 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 --- libXfont/doc/Makefile.in | 53 ++++++++++------------ libXfont/doc/fontlib.xml | 114 ++++++++++++++++------------------------------- 2 files changed, 62 insertions(+), 105 deletions(-) (limited to 'libXfont/doc') 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 @@ + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" +[ + %defs; +]> @@ -15,7 +18,6 @@ The X Font Library - July 27, 1991 Keith @@ -32,10 +34,10 @@ + X Version 11, Release &fullrelvers; + 1993Network Computing Devices + - - Copyright 1993 Network Computing Devices - Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby @@ -50,8 +52,8 @@ any purpose. It is provided “as is” without express or implied warranty. - - Copyright 1993, 1994 X Consortium + + Copyright © 1993, 1994 X Consortium 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. + X Window System is a trademark of The Open Group. + July 27, 1991 @@ -136,10 +140,8 @@ source code, so have a listing handy. - - - Requirements for the Font library - + +Requirements for the Font library To avoid miles of duplicate code in the X server, the font server @@ -177,10 +179,8 @@ - - - General Font Library Interface details. - + +General Font Library Interface details. To avoid collision between the #define name space for errors, the Font @@ -209,10 +209,8 @@ - - - Font Path Elements - + +Font Path Elements At the center of the general font access methods used by X and @@ -269,9 +267,7 @@ typedef struct _FPEFunctions { - - (*name_check) - + (*name_check) Each new font path member is passed to this function; if @@ -286,9 +282,7 @@ typedef struct _FPEFunctions { - - (*init_fpe) - + (*init_fpe) Initialize a new font path element. This function prepares @@ -305,9 +299,7 @@ typedef struct _FPEFunctions { - - (*reset_fpe) - + (*reset_fpe) When the X font path is reset, and some of the new members @@ -324,9 +316,7 @@ typedef struct _FPEFunctions { - - (*free_fpe) - + (*free_fpe) When the server is finished with an FPE, this function is @@ -337,9 +327,7 @@ typedef struct _FPEFunctions { - - (*open_font) - + (*open_font) This routine requests that a font be opened. The - - (*close_font) - + (*close_font) When the server is finished with a font, this routine @@ -387,9 +373,7 @@ typedef struct _FPEFunctions { - - (*list_fonts) - + (*list_fonts) The paths argument is @@ -402,9 +386,7 @@ typedef struct _FPEFunctions { - - (*start_list_fonts_with_info) - + (*start_list_fonts_with_info) This routine sets any internal state for a verbose listing of @@ -414,9 +396,7 @@ typedef struct _FPEFunctions { - - (*list_next_font_with_info) - + (*list_next_font_with_info) To avoid storing huge amounts of data, the interface for @@ -442,9 +422,7 @@ typedef struct _FPEFunctions { - - (*wakeup_fpe) - + (*wakeup_fpe) Whenever an FPE function has returned @@ -458,9 +436,7 @@ typedef struct _FPEFunctions { - - (*client_died) - + (*client_died) When an FPE function has returned Suspended @@ -471,10 +447,8 @@ typedef struct _FPEFunctions { - - - Fonts - + +Fonts The data structure which actually contains the font information has @@ -576,9 +550,7 @@ typedef struct _Font { - - (*get_glyphs) - + (*get_glyphs) This routine returns CharInfoPtrs @@ -592,9 +564,7 @@ typedef struct _Font { - - (*get_metrics) - + (*get_metrics) This is similar to (*get_glyphs) @@ -604,10 +574,8 @@ typedef struct _Font { - - - (*get_bitmaps) - + +(*get_bitmaps) This packs the glyph image data in the requested @@ -618,9 +586,7 @@ typedef struct _Font { - - (*get_extents) - + (*get_extents) This returns the metrics for the specified font from the @@ -630,9 +596,7 @@ typedef struct _Font { - - (*unload_font) - + (*unload_font) This is called from the FPE routine @@ -641,10 +605,8 @@ typedef struct _Font { - - - maxPrivate - + +maxPrivate When initializing a new font structure, -- cgit v1.2.3