diff options
Diffstat (limited to 'doc/xorg-docs/general')
20 files changed, 1634 insertions, 1230 deletions
diff --git a/doc/xorg-docs/general/License.xml b/doc/xorg-docs/general/License.xml index d8b947a38..a01be2cfb 100644 --- a/doc/xorg-docs/general/License.xml +++ b/doc/xorg-docs/general/License.xml @@ -2,10 +2,10 @@ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ -<!ENTITY % defs SYSTEM "/xorg-sgml-doctools/X11/defs.ent"> %defs; +<!ENTITY % defs SYSTEM "defs.ent"> %defs; ]> -<article> +<article id='License'> <articleinfo> @@ -14,7 +14,7 @@ <pubdate>&reldate;</pubdate> </articleinfo> -<sect1> +<sect1 id='Introduction'> <title>Introduction</title> <para> @@ -51,7 +51,7 @@ possible of the code's licenses in the distribution into compliance with the </sect1> -<sect1> +<sect1 id='X.Org_Preferred_License'> <title>X.Org Preferred License</title> <para> @@ -102,7 +102,7 @@ before Daniel Stone). </sect1> -<sect1> +<sect1 id='XFree86_License_1.0'> <title>XFree86 License 1.0</title> <para> @@ -153,7 +153,7 @@ No software incorporating the XFree86 1.1 license has been incorporated. </sect1> -<sect1> +<sect1 id='Other_Licenses'> <title>Other Licenses</title> <para> @@ -161,10 +161,10 @@ Portions of code are covered by the following licenses/copyrights. See individual files for the copyright dates. </para> -<sect2> +<sect2 id='X_MIT_Copyrights'> <title>X/MIT Copyrights</title> -<sect3> +<sect3 id='X_Consortium'> <title>X Consortium</title> <para> @@ -208,7 +208,7 @@ X Window System is a trademark of X Consortium, Inc. </sect3> -<sect3> +<sect3 id='The_Open_Group'> <title>The Open Group</title> <para> @@ -247,10 +247,10 @@ in this Software without prior written authorization from The Open Group. </sect2> -<sect2> -<title>Berkeley-based copyrights:</title> +<sect2 id='Berkeley-based_copyrights'> +<title>Berkeley-based copyrights</title> -<sect3> +<sect3 id='General'> <title>General</title> <para> @@ -290,7 +290,7 @@ derived from this software without specific prior written permission. </para> <para> -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +THIS SOFTWARE IS PROVIDED BY THE AUTHOR <quote>AS IS</quote> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, @@ -304,7 +304,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </sect3> -<sect3> +<sect3 id='UCB_LBL'> <title>UCB/LBL</title> <para> @@ -372,7 +372,7 @@ without specific prior written permission. </para> <para> -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS <quote>AS IS</quote> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE @@ -387,7 +387,7 @@ SUCH DAMAGE. </sect3> -<sect3> +<sect3 id='The_NetBSD_Foundation_Inc.'> <title>The NetBSD Foundation, Inc.</title> <para> @@ -428,7 +428,7 @@ documentation and/or other materials provided with the distribution. <para> THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS -``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +<quote>AS IS</quote> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR @@ -442,8 +442,8 @@ POSSIBILITY OF SUCH DAMAGE. </sect3> -<sect3> -<title>Theodore Ts'o.</title> +<sect3 id='Theodore_Tso'> +<title>Theodore Ts'o</title> <para> Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999. All @@ -486,7 +486,7 @@ written permission. </para> <para> -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED +THIS SOFTWARE IS PROVIDED <quote>AS IS</quote> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE @@ -502,7 +502,7 @@ DAMAGE. </sect3> -<sect3> +<sect3 id='Theo_de_Raadt_and_Damien_Miller'> <title>Theo de Raadt and Damien Miller</title> <para> @@ -537,7 +537,7 @@ documentation and/or other materials provided with the distribution. </para> <para> -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +THIS SOFTWARE IS PROVIDED BY THE AUTHOR <quote>AS IS</quote> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, @@ -551,7 +551,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </sect3> -<sect3> +<sect3 id='Todd_C._Miller'> <title>Todd C. Miller</title> <para> @@ -576,7 +576,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. </sect3> -<sect3> +<sect3 id='Thomas_Winischhofer'> <title>Thomas Winischhofer</title> <para> @@ -619,7 +619,7 @@ derived from this software without specific prior written permission. </para> <para> -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESSED OR +THIS SOFTWARE IS PROVIDED BY THE AUTHOR <quote>AS IS</quote> AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, @@ -636,7 +636,7 @@ POSSIBILITY OF SUCH DAMAGE. </sect2> -<sect2> +<sect2 id='SGI_Free_Software_License_B'> <title>SGI Free Software License B</title> <para> @@ -675,7 +675,7 @@ SOFTWARE. </sect2> -<sect2> +<sect2 id='Bigelow_Holmes_Inc_and_URW_GmbH_Luxi_font_license'> <title>Bigelow & Holmes Inc and URW++ GmbH Luxi font license</title> <para> diff --git a/doc/xorg-docs/general/Makefile.am b/doc/xorg-docs/general/Makefile.am index 70f74745f..2ba8598bb 100644 --- a/doc/xorg-docs/general/Makefile.am +++ b/doc/xorg-docs/general/Makefile.am @@ -3,15 +3,17 @@ SUBDIRS = fonts input graphics platforms if ENABLE_DOCS -doc_sources = \ - License.xml \ - README.xml \ - ReleaseNotes.xml \ +# Main DocBook/XML files (DOCTYPE book) +docbook = \ + License.xml \ + README.xml \ + ReleaseNotes.xml \ Versions.xml -xmldir = $(docdir) -dist_xml_DATA = $(doc_sources) +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir) -include $(top_srcdir)/xmlrules.in +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am endif ENABLE_DOCS diff --git a/doc/xorg-docs/general/Makefile.in b/doc/xorg-docs/general/Makefile.in index 9acb87492..fb818efa5 100644 --- a/doc/xorg-docs/general/Makefile.in +++ b/doc/xorg-docs/general/Makefile.in @@ -15,26 +15,19 @@ @SET_MAKE@ # -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Generate output formats for a single DocBook/XML with/without chapters # -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: +# Variables set by the calling Makefile: +# shelfdir: the location where the docs/specs are installed. Typically $(docdir) +# docbook: the main DocBook/XML file, no chapters, appendix or image files +# chapters: all files pulled in by an XInclude statement and images. # -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. + # -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. +# This makefile is intended for Users Documentation and Functional Specifications. +# Do not use for Developer Documentation which is not installed and does not require olink. +# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 +# for an explanation on documents classification. # srcdir = @srcdir@ @@ -46,9 +39,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +install_sh_DATA = ${SHELL} $(install_sh) -c -m 644 +install_sh_PROGRAM = ${SHELL} $(install_sh) -c +install_sh_SCRIPT = ${SHELL} $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) transform = $(program_transform_name) NORMAL_INSTALL = : @@ -59,10 +52,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(am__dist_xml_DATA_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/xmlrules.in -@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(doc_sources:.xml=.txt) +DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/docbook.am +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) subdir = general ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -78,7 +75,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-recursive installcheck-recursive installdirs-recursive \ pdf-recursive ps-recursive uninstall-info-recursive \ uninstall-recursive -am__dist_xml_DATA_DIST = License.xml README.xml ReleaseNotes.xml \ +am__dist_shelf_DATA_DIST = License.xml README.xml ReleaseNotes.xml \ Versions.xml am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -86,10 +83,10 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)" -dist_xmlDATA_INSTALL = $(INSTALL_DATA) -xmlDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_xml_DATA) $(xml_DATA) +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" +dist_shelfDATA_INSTALL = $(INSTALL_DATA) +shelfDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_shelf_DATA) $(shelf_DATA) ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -107,6 +104,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -140,6 +138,8 @@ HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@ HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@ HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@ HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@ +HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@ +HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@ INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -170,12 +170,14 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -221,31 +223,78 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = fonts input graphics platforms -@ENABLE_DOCS_TRUE@doc_sources = \ -@ENABLE_DOCS_TRUE@ License.xml \ -@ENABLE_DOCS_TRUE@ README.xml \ -@ENABLE_DOCS_TRUE@ ReleaseNotes.xml \ + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_DOCS_TRUE@docbook = \ +@ENABLE_DOCS_TRUE@ License.xml \ +@ENABLE_DOCS_TRUE@ README.xml \ +@ENABLE_DOCS_TRUE@ ReleaseNotes.xml \ @ENABLE_DOCS_TRUE@ Versions.xml -@ENABLE_DOCS_TRUE@xmldir = $(docdir) -@ENABLE_DOCS_TRUE@dist_xml_DATA = $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@xml_DATA = \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(doc_sources:.xml=.html) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_1) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_2) -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -m $(XSL_STYLESHEET) \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath $(XORG_SGML_PATH)/X11 \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam img.src.path=$(abs_builddir)/ - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@SUFFIXES = .xml .ps .pdf .txt .html + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_DOCS_TRUE@shelfdir = $(docdir) + +# DocBook/XML generated output formats to be installed +@ENABLE_DOCS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_DOCS_TRUE@ $(am__append_3) $(am__append_4) + +# DocBook/XML file with chapters, appendix and images it includes +@ENABLE_DOCS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) + + +# Generate documents cross-reference target databases +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +@ENABLE_DOCS_TRUE@CLEANFILES = $(shelf_DATA) all: all-recursive .SUFFIXES: -.SUFFIXES: .xml .ps .pdf .txt .html -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/xmlrules.in $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -275,39 +324,39 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-dist_xmlDATA: $(dist_xml_DATA) +install-dist_shelfDATA: $(dist_shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(dist_xml_DATA)'; for p in $$list; do \ + test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)" + @list='$(dist_shelf_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(dist_xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(dist_xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-dist_xmlDATA: +uninstall-dist_shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_xml_DATA)'; for p in $$list; do \ + @list='$(dist_shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-xmlDATA: $(xml_DATA) +install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(xml_DATA)'; for p in $$list; do \ + test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)" + @list='$(shelf_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-xmlDATA: +uninstall-shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(xml_DATA)'; for p in $$list; do \ + @list='$(shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done # This directory's subdirectories are mostly independent; you can cd @@ -490,7 +539,7 @@ check: check-recursive all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive @@ -518,11 +567,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_DOCS_FALSE@clean-local: -@HAVE_XMLTO_FALSE@clean-local: clean: clean-recursive -clean-am: clean-generic clean-local mostlyclean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-recursive -rm -f Makefile @@ -538,7 +585,7 @@ info: info-recursive info-am: -install-data-am: install-dist_xmlDATA install-xmlDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -564,43 +611,38 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-dist_xmlDATA uninstall-info-am \ - uninstall-xmlDATA +uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ + uninstall-shelfDATA uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-local clean-recursive ctags \ - ctags-recursive distclean distclean-generic \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dist_xmlDATA install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip install-xmlDATA installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ + clean clean-generic clean-recursive ctags ctags-recursive \ + distclean distclean-generic distclean-recursive distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dist_shelfDATA \ + install-exec install-exec-am install-info install-info-am \ + install-man install-shelfDATA install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic maintainer-clean-recursive \ mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-dist_xmlDATA uninstall-info-am uninstall-xmlDATA - - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@clean-local: -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)rm -fr html/ + uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< + +# Generate DocBook/XML output formats with or without stylesheets # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/xorg-docs/general/README.xml b/doc/xorg-docs/general/README.xml index 7c11e2739..7446fa06d 100644 --- a/doc/xorg-docs/general/README.xml +++ b/doc/xorg-docs/general/README.xml @@ -1,10 +1,10 @@ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ -<!ENTITY % defs SYSTEM "/xorg-sgml-doctools/X11/defs.ent"> %defs; +<!ENTITY % defs SYSTEM "defs.ent"> %defs; ]> -<article> +<article id='README'> <articleinfo> @@ -31,7 +31,7 @@ the X11 standard. </articleinfo> -<sect1> +<sect1 id='What_is_X11R&relvers;'> <title>What is X11R&relvers;?</title> <!-- We only do release notes for full releases now. @@ -53,10 +53,6 @@ issues, fixes for driver bugs, and fixes that improve stability. --> <para> X11R&relvers; is the &whichfullrel; release in the X11R&majorvers; series. -Tarballs for packages that have had updates since the &prevrelvers; release -are included in this release. To build this release, you will first need to -get the packages from X11R&prevrelvers; and then add the new packages from -X11R&relvers; to them. </para> <!-- ]]> @@ -89,8 +85,8 @@ hardware support, functional enhancements and bug fixes. ]]> <![ %haverelnotes [ --> -Specific release enhancements can be viewed in the <ulink -url="ReleaseNotes.html">Release Notes</ulink>. +Specific release enhancements can be viewed in the <olink +targetdoc="ReleaseNotes" targetptr="ReleaseNotes">Release Notes</olink>. <!-- ]]> --> @@ -99,8 +95,8 @@ url="ReleaseNotes.html">Release Notes</ulink>. <para> Most modern PC video hardware is supported in this release, and most PC video hardware that isn't supported explicitly can be used with the -"vesa" driver. The <ulink -url="ReleaseNotes.html">Release Notes</ulink> +"vesa" driver. The <olink +targetdoc="ReleaseNotes" targetptr="ReleaseNotes">Release Notes</olink> has a table showing the drivers provided with X11R&relvers;, and links to related documentation. </para> @@ -128,11 +124,11 @@ users alike. <!-- <![ %snapshot [ -<sect1> +<sect1 id='Redistribution_of_Snapshots'> <title>Redistribution of Snapshots</title> <para> -While the X.Org Foundation <ulink -url="LICENSE.html">License</ulink> +While the X.Org Foundation <olink +targetdoc="License" targetptr="License>License</olink> doesn't prohibit vendors and others redistributing binaries of this snapshot release, we don't recommend including them in production releases. @@ -141,7 +137,7 @@ release, we don't recommend including them in production releases. ]]> --> -<sect1> +<sect1 id='Licensing'> <title>Licensing</title> <para> @@ -194,10 +190,10 @@ url="http://www.fsf.org/philosophy/free-sw.html" <para> Copyright and Licensing information for X, including the reproduction of copyright and/or license notices and attributions required by some -of the licenses for binary distributions, can be found in the <ulink -url="License.html">License Document</ulink>. If you find any omissions -in that document, please contact us with details at -<email>xorg@lists.freedesktop.org</email>. +of the licenses for binary distributions, can be found in the <olink +targetdoc="License" targetptr="License">License Document</olink>. +If you find any omissions in that document, please contact us with details at +<email>xorg@lists.x.org</email>. While the current licenses are all open source licenses, the X.Org Foundation is attempting, with time, to bring as much as possible of the code's licenses in the distribution into compliance with the @@ -207,7 +203,7 @@ possible of the code's licenses in the distribution into compliance with the </sect1> -<sect1> +<sect1 id='Pointers_to_additional_information'> <title>Pointers to additional information</title> <para> @@ -217,7 +213,8 @@ url="http://www.x.org/">X.Org web site</ulink>. <para> The X11 version numbering system (including historical information) -can be found in the <ulink url="Versions.html">Versions Document</ulink>. +can be found in the <olink targetdoc="Versions" targetptr="Versions">Versions +Document</olink>. </para> <para> @@ -227,7 +224,7 @@ Additional information may be available at the <ulink url="http://wiki.x.org/" </sect1> -<sect1> +<sect1 id='The_Public_Mailing_Lists'> <title>The Public Mailing Lists</title> <para> @@ -241,7 +238,7 @@ page</ulink>. </sect1> -<sect1> +<sect1 id='Contributing_to_the_X.Org_Foundations_X_efforts.'> <title>Contributing to the X.Org Foundation's X efforts.</title> <para> @@ -258,7 +255,7 @@ SubmittingPatches</ulink> page of the X.Org wiki. </sect1> -<sect1> +<sect1 id='How_to_get_the_release'> <title>How to get the release</title> <!-- @@ -282,7 +279,7 @@ mirrors of this server. ]]> --> -<sect2> +<sect2 id='X11R&relvers;'> <title>X11R&relvers;</title> <para> @@ -305,7 +302,7 @@ build system and modular code base. </sect2> -<sect2> +<sect2 id='The_current_development_tree'> <title>The current development tree</title> <para> @@ -325,7 +322,7 @@ To check out the latest development version, don't specify any tag. </sect1> -<sect1> +<sect1 id='Reporting_Bugs'> <title>Reporting Bugs</title> <para> diff --git a/doc/xorg-docs/general/ReleaseNotes.xml b/doc/xorg-docs/general/ReleaseNotes.xml index 984878eb2..8fd43ba50 100644 --- a/doc/xorg-docs/general/ReleaseNotes.xml +++ b/doc/xorg-docs/general/ReleaseNotes.xml @@ -2,10 +2,10 @@ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ -<!ENTITY % defs SYSTEM "/xorg-sgml-doctools/X11/defs.ent"> %defs; +<!ENTITY % defs SYSTEM "defs.ent"> %defs; ]> -<article> +<article id='ReleaseNotes'> <articleinfo> @@ -30,20 +30,7 @@ </articleinfo> - <sect1> - <title>Dedication</title> - - <para><emphasis> - Two of the early leaders of the X Window System community were - lost to cancer this year — Smokey Wallace, who led the DEC - WSL team which created the initial implementation of X11, and - Hideki Hiura from Sun Microsystems who helped design the X11R6 - internationalization framework. This release is dedicated to - their memory. - </emphasis></para> - </sect1> - - <sect1> + <sect1 id='Introduction_to_the_X11R&relvers;_Release'> <title>Introduction to the X11R&relvers; Release</title> <para> @@ -84,7 +71,7 @@ <para> Once their window system build is established, most builders watch for announcements of individual module updates on the <ulink - url="http://lists.freedesktop.org/mailman/listinfo/xorg-announce" + url="http://lists.x.org/mailman/listinfo/xorg-announce" >xorg-announce mailing list</ulink> and update to those as needed. The X.Org Foundation currently releases the X Window System katamari releases approximately once a year, but many modules, @@ -114,7 +101,7 @@ The release numbering is based on the original MIT X numbering system. X11 refers to the version of the network protocol that the X Window system is based on: Version 11 was first released in 1988 and has been -stable for 22 years, with only upward compatible additions to the core X +stable for nearly 25 years, with only upward compatible additions to the core X protocol, a record of stability envied in computing. Formal releases of X started with X version 9 from MIT; the first commercial X products were based on X version 10. The MIT X Consortium and its successors, @@ -148,7 +135,7 @@ The next section describes what is new in the latest version <!-- <![ %updaterel [ -<sect1> +<sect1 id='Summary_of_updates_in_&relvers;'> <title>Summary of updates in &relvers;</title> <para> </para> @@ -156,7 +143,7 @@ The next section describes what is new in the latest version ]]> --> -<sect1> +<sect1 id='Summary_of_new_features_in_X11R&relvers;'> <title>Summary of new features in X11R&relvers;</title> <para> @@ -170,65 +157,90 @@ The next section describes what is new in the latest version <itemizedlist> <listitem> <para> - <firstterm>InputClass</firstterm> sections in Xorg configuration - files are used to apply configuration options to any input - device matching specified rules, such as device path, - type of device, device manufacturer, or other data provided - by the input hotplug backend. Details can be found in the - <literal>INPUTCLASS</literal> section of the - <ulink url="xorg.conf.5.html">xorg.conf(5)</ulink> manual page. + <firstterm>Multi-touch</firstterm> events are now supported for + touchpads and touchscreens which can report position information + on more than one finger providing input at the same time, such as + found on many tablets and recent laptops. These are exposed by + Xorg server 1.12 and later via the Xinput extension version 2.2. + </para> + </listitem> + + <listitem> + <para> + Additional <firstterm>Xinput extension</firstterm> features were + introduced in version 2.1, as supported in Xorg server 1.11, + including allowing clients to track raw events from input devices, + additional detail in scrolling events so that clients may perform + smoother scrolling, and additional constants in the Xlib-based + libXi API. </para> </listitem> <listitem> <para> - <firstterm>Xorg configuration directories</firstterm> are - used to allow fragments of the X server configuration to be - delivered in individual files. For instance, the input device - driver matching rules previously provided in HAL - <filename>.fdi</filename> files are now provided as - <literal>InputClass</literal> sections in - <filename>.conf</filename> files in a - <filename>xorg.conf.d</filename> directory. + More progress has been made on the X.Org Documentation + modernization - the rest of the library and protocol specifications + have been converted to DocBook XML from the variety of formats they + were previously in, and support for cross-linking between documents + hase been added. On most systems these documents will be + installed under <filename>/usr/share/doc/</filename>. They + are also posted on the X.Org website at + <ulink url="http://www.x.org/releases/X11R7.7/" />. </para> </listitem> - <listitem> + <listitem> <para> - <firstterm>udev</firstterm> is now used by the X server on - Linux systems for input device discovery and hot-plug - notification. Other platforms continue to use the HAL - framework for these tasks for now. + <firstterm>Fence</firstterm> objects are now available in Version + 3.1 of the <olink targetdoc="sync" targetptr="sync">Synchronization + (<quote>Sync</quote>) extension</olink>. These allow clients + to create a object that is either in <quote>triggered</quote> + or <quote>not-triggered</quote> state, and to perform actions + when the object becomes triggered. When a client requests a + fence be triggered, the X server will first complete all rendering + from previous requests that affects resources owned by the fence's + screen before changing the state, so that clients may synchronize + with such rendering. Support for these has been added to both + the <filename class="libraryfile">libxcb-sync</filename> and + <filename class="libraryfile">libXext</filename> API's. + </para> + </listitem> + + <listitem> + <para> + <firstterm>Pointer barriers</firstterm> were added by X Fixes + extension Version 5.0. Compositing managers and desktop + environments may have UI elements in particular screen locations + such that for a single-headed display they correspond to easy + targets, for example, the top left corner. For a multi-headed + environment these corners should still be semi-impermeable. + Pointer barriers allow the application to define additional + constraint on cursor motion so that these areas behave as + expected even in the face of multiple displays. </para> </listitem> + <!-- Skip for 7.7, since only the proto headers landed in time. + Restore for 7.8 once the server & client bits land. <listitem> <para> - <firstterm>X protocol C-language Binding (XCB)</firstterm> - is now included in the katamari, and is required by several - client-side modules, including - <systemitem class="library">libX11</systemitem>, - <command>xlsatoms</command>, <command>xlsclients</command> - and <command>xwininfo</command>. - - XCB is a replacement for Xlib featuring a small footprint, - latency hiding, direct access to the protocol, improved threading - support, and extensibility. More information can be found on - the XCB website at <ulink url="http://xcb.freedesktop.org/" />. + Version 1.2 of the X Resource extension provides new requests + that allow clients to query for additional identification + information about other clients, such as their process id, + and to request size information about the resources clients + have allocated in the X server, to allow better observability + and easier debugging of client resource allocations in the server. </para> </listitem> + --> <listitem> <para> - Major progress has been made on the X.Org Documentation - modernization - most of the library and protocol specifications - are now included in the modules for those libraries and protocols - so they can be updated in sync with new versions, and many have - been converted to DocBook XML from the variety of formats they - were previously in. On most systems these documents will be - installed under <filename>/usr/share/doc/</filename>. They - are also posted on the X.Org website at - <ulink url="http://www.x.org/releases/X11R7.6/" />. + The XCB libraries have begun adding support for the GLX and XKB + extensions. This work is not yet complete in this release, + and not all of the functionality available through these extensions + is accessibile via the XCB APIs. Some of this effort was funded + by past Google Summer of Code projects. </para> </listitem> @@ -249,7 +261,7 @@ The next section describes what is new in the latest version </para> </sect1> - <sect1> + <sect1 id='Overview_of_X11R&relvers;'> <title>Overview of X11R&relvers;</title> <para> @@ -330,10 +342,10 @@ The next section describes what is new in the latest version </para> </sect1> - <sect1> + <sect1 id='Details_of_X11R&relvers;_components'> <title>Details of X11R&relvers; components</title> - <sect2> + <sect2 id='Video_Drivers'> <title>Video Drivers</title> <para> @@ -341,22 +353,19 @@ The next section describes what is new in the latest version </para> <para> - <informaltable id="drivertables" xreflabel="driver tables"> - <tgroup cols="3"> - <colspec align="left" colsep="1"></colspec> - <colspec align="left" colsep="1"></colspec> - <colspec align="left" colsep="1"></colspec> - <tbody> - <row> + <informaltable id="drivertables" xreflabel="driver tables" frame='topbot'> + <tgroup cols="3" colsep='0' rowsep='0'> + <colspec align="left" colwidth="1.0*"/> + <colspec align="left" colwidth="2.0*"/> + <colspec align="left" colwidth="2.0*"/> + <thead> + <row rowsep='1'> <entry>Driver Name</entry> <entry>Description</entry> <entry>Further Information</entry> </row> - <row> - <entry><literal remap="tt">apm</literal></entry> - <entry>Alliance Pro Motion</entry> - <entry><ulink url="apm.html">README.apm</ulink></entry> - </row> + </thead> + <tbody> <row> <entry><literal remap="tt">ark</literal></entry> <entry>Ark Logic</entry> @@ -368,18 +377,16 @@ The next section describes what is new in the latest version <entry> </entry> </row> <row> - <entry><literal remap="tt">chips</literal></entry> - <entry>Chips & Technologies</entry> - <entry><ulink url="chips.html">README.chips</ulink>, - <ulink url="chips.4.html">chips(4)</ulink> - </entry> - </row> - <row> <entry><literal remap="tt">cirrus</literal></entry> <entry>Cirrus Logic</entry> <entry> </entry> </row> <row> + <entry><literal remap="tt">dummy</literal></entry> + <entry>Virtual/offscreen framebuffer</entry> + <entry> </entry> + </row> + <row> <entry><literal remap="tt">fbdev</literal></entry> <entry>Linux framebuffer device</entry> <entry><ulink url="fbdev.4.html">fbdev(4)</ulink></entry> @@ -390,6 +397,11 @@ The next section describes what is new in the latest version <entry> </entry> </row> <row> + <entry><literal remap="tt">glide</literal></entry> + <entry>3Dfx Voodoo 1, 2, Banshee, 3, 4 & 5</entry> + <entry><ulink url="glide.4.html">glide(4)</ulink></entry> + </row> + <row> <entry><literal remap="tt">glint</literal></entry> <entry>3Dlabs, TI</entry> <entry><ulink url="glint.4.html">glint(4)</ulink></entry> @@ -397,29 +409,19 @@ The next section describes what is new in the latest version <row> <entry><literal remap="tt">i128</literal></entry> <entry>Number Nine</entry> - <entry><ulink url="I128.html">README.I128</ulink>, + <entry><ulink url="I128.txt">README.I128</ulink>, <ulink url="i128.4.html">i128(4)</ulink></entry> </row> <row> - <entry><literal remap="tt">i740</literal></entry> - <entry>Intel i740</entry> - <entry><ulink url="i740.html">README.i740</ulink></entry> - </row> - <row> - <entry><literal remap="tt">imstt</literal></entry> - <entry>Integrated Micro Solns</entry> - <entry> </entry> - </row> - <row> <entry><literal remap="tt">intel</literal></entry> - <entry>Intel i8xx/i9xx</entry> - <entry><ulink url="intel.html">README.intel</ulink>, + <entry>Intel Integrated Graphics Processors</entry> + <entry><ulink url="intel.txt">README.intel</ulink>, <ulink url="intel.4.html">intel(4)</ulink></entry> </row> <row> <entry><literal remap="tt">mach64</literal></entry> <entry>ATI Mach64</entry> - <entry><ulink url="ati.html">README.ati</ulink></entry> + <entry><ulink url="ati.txt">README.ati</ulink></entry> </row> <row> <entry><literal remap="tt">mga</literal></entry> @@ -434,15 +436,10 @@ The next section describes what is new in the latest version <row> <entry><literal remap="tt">newport</literal> (-)</entry> <entry>SGI Newport</entry> - <entry><ulink url="newport.html">README.newport</ulink>, + <entry><ulink url="newport.txt">README.newport</ulink>, <ulink url="newport.4.html">newport(4)</ulink></entry> </row> <row> - <entry><literal remap="tt">nsc</literal></entry> - <entry>National Semiconductor</entry> - <entry><ulink url="nsc.4.html">nsc(4)</ulink></entry> - </row> - <row> <entry><literal remap="tt">nv</literal></entry> <entry>NVIDIA</entry> <entry><ulink url="nv.4.html">nv(4)</ulink></entry> @@ -450,7 +447,7 @@ The next section describes what is new in the latest version <row> <entry><literal remap="tt">r128</literal></entry> <entry>ATI Rage128</entry> - <entry><ulink url="r128.html">README.r128</ulink>, + <entry><ulink url="r128.txt">README.r128</ulink>, <ulink url="r128.4.html">r128(4)</ulink></entry> </row> <row> @@ -458,24 +455,6 @@ The next section describes what is new in the latest version <entry>ATI Radeon</entry> <entry><ulink url="radeon.4.html">radeon(4)</ulink></entry> </row> - - <row> - <entry><literal remap="tt">rendition</literal></entry> - <entry>Rendition</entry> - <entry><ulink url="rendition.html">README.rendition</ulink>, - <ulink url="rendition.4.html">rendition(4)</ulink></entry> - </row> - <row> - <entry><literal remap="tt">s3</literal></entry> - <entry>S3 (not ViRGE or Savage)</entry> - <entry> </entry> - </row> - <row> - <entry><literal remap="tt">s3virge</literal></entry> - <entry>S3 ViRGE</entry> - <entry><ulink url="s3virge.html">README.s3virge</ulink>, - <ulink url="s3virge.4.html">s3virge(4)</ulink></entry> - </row> <row> <entry><literal remap="tt">savage</literal></entry> <entry>S3 Savage</entry> @@ -489,25 +468,10 @@ The next section describes what is new in the latest version <row> <entry><literal remap="tt">sis</literal></entry> <entry>SiS</entry> - <entry><ulink url="SiS.html">README.SiS</ulink>, + <entry><ulink url="SiS.txt">README.SiS</ulink>, <ulink url="sis.4.html">sis(4)</ulink></entry> </row> <row> - <entry><literal remap="tt">sisusb</literal></entry> - <entry>SiS USB</entry> - <entry><ulink url="sisusb.4.html">sisusb(4)</ulink></entry> - </row> - <row> - <entry><literal remap="tt">suncg14</literal> (+)</entry> - <entry>Sun cg14</entry> - <entry> </entry> - </row> - <row> - <entry><literal remap="tt">suncg3</literal> (+)</entry> - <entry>Sun cg3</entry> - <entry> </entry> - </row> - <row> <entry><literal remap="tt">suncg6</literal> (+)</entry> <entry>Sun GX and Turbo GX</entry> <entry> </entry> @@ -518,17 +482,6 @@ The next section describes what is new in the latest version <entry> </entry> </row> <row> - <entry><literal remap="tt">sunleo</literal> (+)</entry> - <entry>Sun Leo (ZX)</entry> - <entry> </entry> - </row> - <row> - <entry> - <literal remap="tt">suntcx</literal> (+)</entry> - <entry>Sun TCX</entry> - <entry> </entry> - </row> - <row> <entry><literal remap="tt">tdfx</literal></entry> <entry>3Dfx Voodoo Banshee, 3, 4 & 5</entry> <entry><ulink url="tdfx.4.html">tdfx(4)</ulink></entry> @@ -544,11 +497,6 @@ The next section describes what is new in the latest version <entry><ulink url="trident.4.html">trident(4)</ulink></entry> </row> <row> - <entry><literal remap="tt">tseng</literal></entry> - <entry>Tseng Labs</entry> - <entry> </entry> - </row> - <row> <entry><literal remap="tt">v4l</literal></entry> <entry>Video4Linux</entry> <entry><ulink url="v4l.4.html">v4l(4)</ulink></entry> @@ -573,16 +521,6 @@ The next section describes what is new in the latest version <entry>Workstation Framebuffer</entry> <entry><ulink url="wsfb.4.html">wsfb(4)</ulink></entry> </row> - <row> - <entry><literal remap="tt">xgi</literal></entry> - <entry>XGI</entry> - <entry><ulink url="xgi.4.html">xgi(4)</ulink></entry> - </row> - <row> - <entry><literal remap="tt">xgixp</literal></entry> - <entry>XGI XP</entry> - <entry><ulink url="xgixp.4.html">xgixp(4)</ulink></entry> - </row> </tbody> </tgroup> </informaltable> @@ -602,7 +540,7 @@ The next section describes what is new in the latest version </para> </sect2> - <sect2> + <sect2 id='Input_Drivers'> <title>Input Drivers</title> <para> @@ -611,27 +549,20 @@ The next section describes what is new in the latest version <para> - <informaltable> - <tgroup cols="3"> - <colspec align="left" colsep="1"></colspec> - <colspec align="left" colsep="1"></colspec> - <colspec align="left" colsep="1"></colspec> - <tbody> - <row> + <informaltable frame='topbot'> + <?dbfo keep-together="always" ?> + <tgroup cols="3" colsep='0' rowsep='0'> + <colspec colname='c1' align="left" colwidth="1.0*"/> + <colspec colname='c2' align="left" colwidth="1.0*"/> + <colspec colname='c3' align="left" colwidth="1.0*"/> + <thead> + <row rowsep='1'> <entry>Driver Name</entry> <entry>Description</entry> <entry>Further Information</entry> </row> - <row> - <entry><literal remap="tt">acecad</literal></entry> - <entry>Acecad Flair</entry> - <entry><ulink url="aiptek.4.html">acecad(4)</ulink></entry> - </row> - <row> - <entry><literal remap="tt">aiptek(*)</literal></entry> - <entry>Aiptek USB tablet</entry> - <entry><ulink url="aiptek.4.html">aiptek(4)</ulink></entry> - </row> + </thead> + <tbody> <row> <entry><literal remap="tt">evdev(*)</literal></entry> <entry>Linux kernel EvDev</entry> @@ -678,9 +609,9 @@ The next section describes what is new in the latest version </sect2> - <sect2> + <sect2 id='Xorg_server'> <title>Xorg server</title> - <sect3> + <sect3 id='Loader_and_Modules'> <title>Loader and Modules</title> <para> @@ -694,27 +625,26 @@ The next section describes what is new in the latest version <para> The module interfaces (both API and ABI) used in this release are subject to change without notice. While we will attempt to provide - backward compatibility for the module interfaces, we cannot - guarantee this. Compatibility in the other direction is explicitly - not guaranteed because new modules may rely on interfaces added in - new releases. + backward compatibility for the module interfaces in stable releases, + we cannot guarantee this. Compatibility in the other direction is + explicitly not guaranteed because new modules may rely on interfaces + added in new releases, nor is compatibility across stable release + branches (such as between Xorg 1.11 and 1.12). </para> <warning> <title>Note about module security</title> - <para>The X server runs with root privileges, i.e., - the X server loadable modules also run with these privileges. + <para>The Xorg server runs with root privileges, so + the Xorg server loadable modules also run with these privileges. For this reason we recommend that all users be careful to only use loadable modules from reliable sources, otherwise the - introduction of viruses and contaminated code can occur and - wreak havoc on your system. We hope to have a mechanism for - signing/verifying the modules that we provide available in a - future release. + introduction of malware and contaminated code can occur and + wreak havoc on your system. </para></warning> </sect3> - <sect3 id="config"> - <title>Configuration File</title> + <sect3 id='Configuration_File'> +<title>Configuration File</title> <para> The Xorg server uses a configuration file as the primary mechanism @@ -726,7 +656,9 @@ The next section describes what is new in the latest version <para> Note that this release features significant improvements for running the server without a configuration file, so many users - may find that that they don't need a configuration file. + may find that that they don't need a configuration file, or may + rely on just snippets of configuration placed in the + <filename class="directory">xorg.conf.d</filename> directory. </para> <para> @@ -749,18 +681,21 @@ The next section describes what is new in the latest version </sect3> - <sect3> + <sect3 id='Command_Line_Options'> <title>Command Line Options</title> <para> Command line options can be used to override some default parameters and parameters provided in the configuration file. - These command line options are described in the <ulink - url="Xorg.1.html">Xorg(1)</ulink> manual page. + Command line options available for use with all X servers in + this release are described in the <ulink + url="Xserver.1.html">Xserver(1)</ulink> manual page. + Command line options specific to the Xorg server are described in + the <ulink url="Xorg.1.html">Xorg(1)</ulink> manual page. </para> </sect3> - <sect3> + <sect3 id='Multi-head'> <title>Multi-head</title> <para> @@ -782,7 +717,7 @@ The next section describes what is new in the latest version </para> </sect3> - <sect3> + <sect3 id='Xinerama'> <title>Xinerama</title> <para> <firstterm>Xinerama</firstterm> is an X server extension that @@ -802,7 +737,7 @@ The next section describes what is new in the latest version </para> </sect3> - <sect3> + <sect3 id='DDC'> <title>DDC</title> <para> @@ -830,22 +765,30 @@ The next section describes what is new in the latest version configuration file don't match those that are detected. </para> - <sect4> - <title>Changed behavior caused by DDC.</title> + <sect4 id='Changed_behavior_in_handling_information_from_DDC'> + <title>Changed behavior in handling information from DDC</title> <para> - Several drivers use DDC information to set the screen size and - pitch. This can be overridden by explicitly resetting it to - the and non-DDC default value 75 with the <option>-dpi 75</option> - command line option for the X - server, or by specifying appropriate screen dimensions with the - "DisplaySize" keyword in the "Monitor" section of the config - file. + The X server previously used DDC information to detect screen + size and pitch, and compute DPI automatically, allowing fonts + and other UI elements to automatically scale to appropriate + sizes. This mechanism worked reasonably well for many + single-monitor cases, but did not compute accurate DPI values + for multi-monitor cases or less common single-display setups. + Thus, this autodetection has been removed, and the X server no + longer tries to compute an appropriate DPI value. All users + wanting fonts, physical measurement units, and other UI elements + scaled appropriately for their display (including users for whom + autodetection previously worked) must now set DPI or some other + scaling factor explicitly, either via the X server's + <option>-dpi</option> option, a DPI setting in their graphical + enironment, or an alternate scaling mechanism provided by their + environment. </para> </sect4> </sect3> - <sect3> + <sect3 id='GLX_and_the_Direct_Rendering_Infrastructure_DRI'> <title>GLX and the Direct Rendering Infrastructure (DRI)</title> <para> @@ -867,7 +810,7 @@ The next section describes what is new in the latest version </para> </sect3> - <sect3> + <sect3 id='Terminate_Server_keystroke'> <title>Terminate Server keystroke</title> <para> @@ -891,19 +834,68 @@ The next section describes what is new in the latest version <screen> setxkbmap -option "terminate:ctrl_alt_bksp" </screen> - <ulink url="input/XKB-Config.html">The XKB Configuration - Guide</ulink> also includes - <ulink url="input/XKB-Config.html#zap">an example xorg.conf.d - file that sets the + <olink targetdoc="XKB-Config" targetptr="XKB-Config">The XKB + Configuration Guide</olink> also includes + <olink targetdoc="XKB-Config" targetptr="zap">an example + xorg.conf.d file that sets the “<option>terminate:ctrl_alt_bksp</option>” - option by default on all keyboards</ulink>. + option by default on all keyboards</olink>. Many desktop environments include XKB configuration options in their preferences to enable this as well. </para> </sect3> +<sect3 id='Grab_debugging_keystrokes'> + <title>Grab debugging keystrokes</title> - <sect3> + <para> + The Xorg server in this release provides various functions + that can be mapped to keystrokes to aid in the debugging of + programs with errant input grabs. + </para> + <para> + The keysyms <keysym>XF86LogGrabInfo</keysym> and + <keysym>XF86LogWindowTree</keysym> are defined to + print information to the Xorg log file on the current set + of input grabs, and the window tree of the current display. + By default, these are available for use, but not mapped to any key. + </para> + <para> + The keysym <keysym>XF86Ungrab</keysym> forces the X server + to release all active grabs, which may leave the clients holding + them in an inconsistent state. <keysym>XF86ClearGrab</keysym> + goes further, killing the client connection of any client holding + an active grab when it is pressed. These keystrokes are + intended to allow developers to debug clients which are not + properly releasing grabs or have problems occur while input is + grabbed. Since grabs are a fundamental part of the X + client security model, these keystrokes come with risks, such + as the ability to bypass or kill screen locks without knowing + the password, and thus are not available by default. + </para> + <para> + Users who are willing to accept the security risk and wish to enable + this functionality may do so via the XKB configuration option + “<option>grab:break_actions</option>”. + </para> + <warning> + <title>Security issue in older xkeyboard-config releases</title> + <para> + The xkeyboard-config data files included in this release have + the grab disabling keys correctly disabled by default, but + versions before xkeyboard-config 2.5 had them enabled, leading + to the security risk described above. When upgrading to the + X server in this release be sure to also ensure xkeyboard-config + is a safe version. More details about this issue may be found + in <ulink +url="http://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html" + >advisories for CVE-2012-0064</ulink>. + </para> + </warning> + </sect3> + + + <sect3 id='X_Server_startup_state'> <title>X Server startup state</title> <para> @@ -917,14 +909,14 @@ The next section describes what is new in the latest version </sect2> <!-- - <sect2> + <sect2 id='Other_extensions'> <title>Other extensions</title> <para></para> </sect2> --> <!-- -<sect1> +<sect1 id='X_libraries_and_clients'> <title>X libraries and clients</title> <para> </para> @@ -932,23 +924,23 @@ The next section describes what is new in the latest version --> <!-- -<sect1> +<sect1 id='Fonts_and_Internationalisation'> <title>Fonts and Internationalisation</title> <para> </para> </sect1> --> - <sect2 id="font"> - <title>Font support</title> + <sect2 id='Font_support'> +<title>Font support</title> <para> Details about the font support in X11R&relvers; can be - found in the <quote><ulink url="fonts/fonts.html" - >Fonts in X11R&relvers;</ulink></quote> document. + found in the <quote><olink targetdoc="fonts" targetptr="fonts" + >Fonts in X11R&relvers;</olink></quote> document. </para> - <sect3> + <sect3 id='Default_font_installation_directory'> <title>Default font installation directory</title> <para> @@ -973,7 +965,7 @@ The next section describes what is new in the latest version </para> </sect3> - <sect3> + <sect3 id='Bitmap_font_compression_methods'> <title>Bitmap font compression methods</title> <para> @@ -996,7 +988,7 @@ The next section describes what is new in the latest version </para> </sect3> - <sect3> + <sect3 id='Type1_Font_support'> <title>Type1 Font support</title> <para> @@ -1007,7 +999,7 @@ The next section describes what is new in the latest version </para> </sect3> - <sect3> + <sect3 id='CID_Font_support'> <title>CID Font support</title> <para> @@ -1023,10 +1015,33 @@ The next section describes what is new in the latest version </sect1> - <sect1> + <sect1 id='Build_changes_and_issues'> <title>Build changes and issues</title> - <sect2> + <sect2 id='Strict_compilation_flags'> + <title>Strict compilation flags</title> + + <para> + Most of the modules in this release use stricter compiler flags + when building with the GNU gcc, LLVM clang, Oracle Solaris Studio, + or Intel compilers. These flags both enable more warnings, and + promote some warnings to fatal errors in the build. If these + flags cause your build to fail, you can disable the flags that + turn these selected warnings into errors by adding + <option>--disable-selective-werror</option> to the configure command + for the affected module. If that is necessary for any X.Org modules, + please report a bug in the xorg product on + <ulink url="https://bugs.freedesktop.org/" />. + </para> + + <para> + Builders seeking even stricter compiler checks can instead pass + <option>--enable-strict-compilation</option> to the configure command + to make all warnings become errors. + </para> + </sect2> + + <sect2 id='Silent_build_rules'> <title>Silent build rules</title> <para> @@ -1044,7 +1059,7 @@ The next section describes what is new in the latest version </para> </sect2> - <sect2> + <sect2 id='New_configure_options_for_font_modules'> <title>New configure options for font modules</title> <para> @@ -1056,7 +1071,7 @@ The next section describes what is new in the latest version </para> </sect2> - <sect2> + <sect2 id='New_configure_options_for_documentation_in_modules'> <title>New configure options for documentation in modules</title> <para> @@ -1129,7 +1144,7 @@ The next section describes what is new in the latest version </sect1> - <sect1> + <sect1 id='Miscellaneous'> <title>Miscellaneous</title> <para> @@ -1137,7 +1152,7 @@ The next section describes what is new in the latest version X11R&relvers; release. </para> - <sect2> + <sect2 id='Socket_directory_ownership_and_permissions'> <title>Socket directory ownership and permissions</title> <para> @@ -1179,7 +1194,7 @@ The next section describes what is new in the latest version </sect1> - <sect1> + <sect1 id='Deprecated_components_and_removal_plans'> <title>Deprecated components and removal plans</title> <para> @@ -1191,13 +1206,13 @@ The next section describes what is new in the latest version distribution in the core X11 releases outweighs the benefits of doing so. In some cases, this is simply because no one has volunteered to do continued maintenance, so if software is listed here that you need, you - can contact <email>xorg@lists.freedesktop.org</email> to volunteer to + can contact <email>xorg-devel@lists.x.org</email> to volunteer to take over maintainership, either inside or outside of the Xorg release process. </para> - <sect2> + <sect2 id='Future_Removals'> <title>Future Removals</title> <variablelist> @@ -1221,12 +1236,12 @@ The next section describes what is new in the latest version <term>Input device discovery via HAL</term> <listitem> <para> - The Xorg server currently uses the <ulink + Xorg server 1.4 started using the <ulink url="http://www.freedesktop.org/wiki/Software/hal">HAL framework</ulink> to discover connected input devices, receive notification of hotplug events for them, and to retrieve configuration parameters for them. The HAL - maintainers have deprecated HAL, so the X.Org developers + maintainers have since deprecated HAL, so the X.Org developers have begun replacement with alternatives. As a result, configuration of input devices via HAL <filename>*.fdi</filename> files is no longer supported @@ -1235,34 +1250,64 @@ The next section describes what is new in the latest version </para> </listitem> </varlistentry> + + <varlistentry> + <term>Nested and virtual X servers</term> + <listitem> + <para> + As described in <xref linkend='Overview_of_X11R&relvers;' />, + this release contains several X servers that either display + onto another X server (<command>Xephyr</command> & + <command>Xnest</command>), or render into a virtual memory + framebuffer (<command>Xvfb</command> & + <command>Xfake</command>). These may be replaced in a future + release by use of the <command>Xorg</command> server with the + <literal remap="tt">xf86-video-nested</literal> and + <literal remap="tt">xf86-video-dummy</literal> drivers + which perform the same tasks. + </para> + </listitem> + </varlistentry> </variablelist> </sect2> - <sect2> + <sect2 id='Removed_in_this_Release'> <title>Removed in this Release</title> <para> <variablelist> - <varlistentry> - <term>Xprint</term> + + <varlistentry> + <term>Unmaintained drivers</term> <listitem> <para> - The Xprint server and extension were previously removed - from X11R7.5. This release removes Xprint support from - a number of client programs that still had it. + This release no longer contains the following drivers, + due to lack of maintainers with relevant hardware. + Existing driver versions may work with current Xorg servers, + but they are not being actively updated to support Xorg + driver API & ABI changes. + <itemizedlist> + <listitem><para>xf86-input-acecad: Acecad Flair</para></listitem> + <listitem><para>xf86-input-aiptek: Aiptek USB tablet</para></listitem> + <listitem><para>xf86-video-apm: Alliance Pro Motion</para></listitem> + <listitem><para>xf86-video-chips: Chips & Technologies</para></listitem> + <listitem><para>xf86-video-i740: Intel i740</para></listitem> + <listitem><para>xf86-video-rendition: Rendition Verite</para></listitem> + <listitem><para>xf86-video-s3: S3 (not ViRGE or Savage)</para></listitem> + <listitem><para>xf86-video-s3virge: S3 ViRGE</para></listitem> + <listitem><para>xf86-video-sisusb: SiS Net2280-based USB</para></listitem> + <listitem><para>xf86-video-suncg14: Sun CG14</para></listitem> + <listitem><para>xf86-video-suncg3: Sun CG3</para></listitem> + <listitem><para>xf86-video-sunleo: Sun Leo (ZX)</para></listitem> + <listitem><para>xf86-video-suntcx: Sun TCX</para></listitem> + <listitem><para>xf86-video-tseng: Tseng Labs</para></listitem> + <listitem><para>xf86-video-xgi: XGI</para></listitem> + <listitem><para>xf86-video-xgixp: XGI Volari 8300</para></listitem> + </itemizedlist> </para> </listitem> - </varlistentry> - - <varlistentry> - <term>Xsdl server</term> - <listitem> - <para> - The experimental Xsdl server has never been finished or - maintained, and was removed in this release. - </para> - </listitem> - </varlistentry> + </varlistentry> +<!-- <varlistentry> <term>Unmaintained extensions</term> <listitem> @@ -1276,12 +1321,13 @@ The next section describes what is new in the latest version </para> </listitem> </varlistentry> + --> </variablelist> </para> </sect2> </sect1> - <sect1> + <sect1 id='Attributions_Acknowledgements_Credits'> <title>Attributions/Acknowledgements/Credits</title> <!-- @@ -1318,266 +1364,392 @@ The next section describes what is new in the latest version since the release of X11R&prevrelvers;: <simplelist type='vert' columns='2'> - <member>邓逸昕</member> + <member>Aapo Rantalainen</member> + <member>Aaron Culich</member> <member>Aaron Plattner</member> - <member>Aaron Zang</member> + <member>Abdoulaye Walsimou Gaye</member> <member>Adam Jackson</member> <member>Adam Tkac</member> - <member>Adrian 'Dagurashibanipal' von Bidder</member> <member>Adrian Bunk</member> <member>Alan Coopersmith</member> - <member>Alberto Milone</member> + <member>Alan Curry</member> + <member>Alan Hourihane</member> + <member>Alban Browaeys</member> + <member>Albert Damen</member> + <member>Aldis Berjoza</member> + <member>Alessandro Guido</member> <member>Alex Deucher</member> - <member>Alex Warg</member> - <member>Alexander Kabaev</member> - <member>Alp Toker</member> - <member>Andrej Gelenberg</member> - <member>Andres Salomon</member> - <member>Andrew Chant</member> + <member>Alex Plotnick</member> + <member>Alexander Polakov</member> + <member>Alexandr Shadchin</member> + <member>Alexandre Julliard</member> + <member>Alexey Shumitsky</member> + <member>Alistair Leslie-Hughes</member> + <member>Ander Conselvan de Oliveira</member> + <member>Andrea Canciani</member> + <member>Andreas Schwab</member> + <member>Andreas Wettstein</member> <member>Andrew Randrianasulu</member> - <member>Andrzej Hajda</member> + <member>Andrew Turner</member> <member>Andy Furniss</member> - <member>Andy Ritger</member> - <member>Antoine Latter</member> + <member>Anssi Hannula</member> + <member>Antoine Martin</member> <member>Arkadiusz Miśkiewicz</member> + <member>Armin K</member> <member>Arnaud Fontaine</member> - <member>Auke Kok</member> - <member>Bart Massey</member> - <member>Bartek Iwaniec</member> + <member>Arthur Taylor</member> + <member>Arvind Umrao</member> + <member>Avram Lyon</member> <member>Bartosz Brachaczek</member> - <member>Ben Byer</member> + <member>Bartosz Kosiorek</member> + <member>Bastian Blank</member> + <member>Bastien Nocera</member> <member>Ben Hutchings</member> - <member>Ben Skeggs</member> <member>Benjamin Close</member> + <member>Benjamin Herrenschmidt</member> + <member>Benjamin Otte</member> <member>Benjamin Tissoires</member> - <member>Bernhard R. Link</member> - <member>Bob Ham</member> - <member>Brian Paul</member> - <member>Brice Goglin</member> + <member>Bernie Innocenti</member> + <member>Bill Nottingham</member> + <member>Bjørn Mork</member> + <member>Bodo Graumann</member> <member>Bryce Harrington</member> <member>Carl Worth</member> <member>Carlos Garnacho</member> - <member>Carsten Meier</member> - <member>Cedric Cellier</member> + <member>Casper Dik</member> + <member>Cédric Cano</member> + <member>Chad Versace</member> <member>Chase Douglas</member> + <member>Choe Hwanjin</member> <member>Chris Bagwell</member> <member>Chris Ball</member> - <member>Chris Dekter</member> - <member>Chris Humbert</member> + <member>Chris Halse Rogers</member> <member>Chris Wilson</member> - <member>Christian Bühler</member> - <member>Christian Hartmann</member> - <member>Christian Zander</member> - <member>Christoph Pfister</member> + <member>Christian König</member> + <member>Christian Toutant</member> + <member>Christian Weisgerber</member> + <member>Christoph Brill</member> + <member>Christoph Reimann</member> + <member>Christophe Roland</member> <member>Christopher James Halse Rogers</member> - <member>Cody Maloney</member> + <member>Christopher Yeleighton</member> + <member>Clemens Eisserer</member> <member>Colin Harrison</member> - <member>Colin Watson</member> - <member>Cooper Yuan</member> - <member>Corbin Simpson</member> - <member>Csillag Kristof</member> + <member>Cristian Rodríguez</member> <member>Cyril Brulebois</member> + <member>Daiki Ueno</member> + <member>Dan Horák</member> <member>Dan Nicholson</member> + <member>Daniel A. Steffen</member> <member>Daniel Drake</member> - <member>Daniel Kahn Gillmor</member> + <member>Daniel Kurtz</member> <member>Daniel Stone</member> + <member>Daniel Vetter</member> <member>Dave Airlie</member> + <member>David Barksdale</member> + <member>David Coles</member> + <member>David Coppa</member> + <member>David Fries</member> <member>David Ge</member> - <member>David James</member> + <member>David Nusinow</member> + <member>David Reveman</member> <member>David Ronis</member> - <member>David Woodhouse</member> - <member>Diego 'Flameeyes' Pettenò</member> - <member>Dima Kogan</member> + <member>Denis 'GNUtoo' Carikli</member> + <member>Derek Buitenhuis</member> + <member>Derek Foreman</member> + <member>Derek Wang</member> + <member>Devin J. Pohly</member> + <member>Diego Elio Pettenò</member> <member>Dirk Wallenstein</member> - <member>Dmitry Torokhov</member> - <member>Dominik Jasiok</member> - <member>Donnie Berkholz</member> + <member>dtakahashi42</member> <member>Eamon Walsh</member> <member>Ed Schouten</member> - <member>Edward Moy</member> - <member>Edward O'Callaghan</member> + <member>Edward Sheldrake</member> <member>Egbert Eich</member> + <member>Eitan Adler</member> + <member>Elias Probst</member> + <member>Elie Bleton</member> + <member>Elvis Pranskevichus</member> + <member>Emanuele Giaquinta</member> + <member>Eoghan Sherry</member> <member>Eric Anholt</member> - <member>Éric Piel</member> - <member>Eric Sesterhenn</member> + <member>Erik Kilfoil</member> + <member>Erik Saule</member> + <member>Erkki Seppälä</member> + <member>Eugeni Dodonov</member> + <member>Evan Broder</member> <member>Fabio Pedretti</member> + <member>Federico Mena Quintero</member> <member>Fernando Carrijo</member> + <member>Ferry Huberts</member> <member>Francisco Jerez</member> <member>Frank Huang</member> + <member>Frank Mariak</member> + <member>Frédéric Boiteux</member> <member>Fredrik Höglund</member> - <member>Gabor Z. Papp</member> + <member>Fryderyk Dziarmagowski</member> <member>Gaetan Nadon</member> - <member>Geoffrey Li</member> + <member>George Staplin</member> + <member>Giuseppe Bilotta</member> + <member>Glenn Burkhardt</member> <member>Guillem Jover</member> - <member>Hans Nieser</member> - <member>Heikki Lindholm</member> - <member>Henning Sten</member> + <member>György Balló</member> + <member>Hans Verkuil</member> + <member>Hans-Juergen Mauser</member> + <member>Hans-Peter Budek</member> + <member>Harshula Jayasuriya</member> + <member>Havoc Pennington</member> <member>Henry Zhao</member> - <member>Hiroyuki Ikezoe</member> - <member>Horst Wente</member> - <member>Hunk Cui</member> <member>Ian Osgood</member> <member>Ian Romanick</member> - <member>Ingmar Vanhassel</member> + <member>Ilija Hadzic</member> + <member>Ivan Bulatovic</member> <member>Jakob Bornecrantz</member> <member>James Cloos</member> <member>James Jones</member> - <member>James Le Cuirot</member> + <member>James Simmons</member> <member>Jamey Sharp</member> + <member>Jamie Kennea</member> <member>Jan Hauffa</member> - <member>Jens Petersen</member> + <member>Jan Kriho</member> + <member>Janne Huttunen</member> + <member>Jari Aalto</member> + <member>Javier Acosta</member> + <member>Javier Jardón</member> + <member>Javier Pello</member> + <member>Jay Cotton</member> + <member>Jeetu Golani</member> + <member>Jeff Chua</member> + <member>Jens Elkner</member> <member>Jeremy Huddleston</member> - <member>Jeremy Kolb</member> - <member>Jeroen Hoek</member> + <member>Jerome Carretero</member> <member>Jerome Glisse</member> <member>Jesse Adkins</member> <member>Jesse Barnes</member> - <member>Jim Ingram</member> - <member>Jim Ramsay</member> - <member>Joachim Breitner</member> + <member>Jian Zhao</member> + <member>JJ Ding</member> + <member>Joe Nahmias</member> + <member>Joe Shaw</member> + <member>Joerg Sonnenberger</member> + <member>Johannes Obermayr</member> + <member>John Martin</member> + <member>Jon Nettleton</member> <member>Jon TURNEY</member> + <member>Jools Wills</member> + <member>Jordan Hayes</member> + <member>Jörn Horstmann</member> <member>Josh Triplett</member> <member>Julien Cristau</member> <member>Julien Danjou</member> - <member>Juliusz Chroboczek</member> + <member>Justin Dou</member> <member>Justin Mattock</member> - <member>Kalle Olavi Niemitalo</member> - <member>Karl Tomlinson</member> + <member>Kai-Uwe Behrmann</member> <member>Kees Cook</member> <member>Keith Packard</member> <member>Kenneth Graunke</member> - <member>Kevin E Martin</member> - <member>Kevin Van Vechten</member> - <member>Kim Woelders</member> - <member>Kok, Auke</member> + <member>Kent Baxley</member> + <member>Kirill Elagin</member> + <member>Knut Petersen</member> + <member>Konstantin Belousov</member> <member>Kristian Høgsberg</member> + <member>Kristof Szabo</member> + <member>Krzysztof Halasa</member> <member>Kusanagi Kouichi</member> - <member>Lee Leahu</member> - <member>Leif Middelschulte</member> - <member>Leonardo Chiquitto</member> - <member>Lubos Lunak</member> + <member>Lennart Poettering</member> + <member>Lev Nezhdanov</member> + <member>Linus Arver</member> <member>Luc Verhaegen</member> - <member>Luca Tettamanti</member> - <member>Ma Ling</member> + <member>Maarten Lankhorst</member> <member>Maarten Maathuis</member> <member>Macpaul Lin</member> <member>Magnus Kessler</member> - <member>Marc Majka</member> - <member>Marcin Baczyński</member> <member>Marcin Kościelnicki</member> <member>Marcin Slusarz</member> + <member>Marcin Woliński</member> <member>Marek Olšák</member> <member>Mario Kleiner</member> + <member>Mark Dokter</member> <member>Mark Kettenis</member> + <member>Mark Schreiber</member> + <member>Marko Macek</member> <member>Marko Myllynen</member> <member>Markus Duft</member> - <member>Markus Gapp</member> - <member>Markus Strobl</member> + <member>Markus Fleschutz</member> <member>Mart Raudsepp</member> - <member>Martin Ettl</member> - <member>Martin Otte</member> - <member>Martin Pärtel</member> + <member>Martin Langhoff</member> <member>Martin-Éric Racine</member> - <member>Márton Németh</member> + <member>Marton Balint</member> + <member>Matěj Cepl</member> + <member>Mathias Krause</member> + <member>Mathieu Bérard</member> + <member>Mathieu Taillefumier</member> <member>Matt Dew</member> <member>Matt Turner</member> - <member>Matteo Delfino</member> + <member>Matthew D. Fuller</member> + <member>matthew green</member> + <member>Matthias Clasen</member> <member>Matthias Hopf</member> <member>Matthieu Herrb</member> - <member>Matthijs Kooijman</member> - <member>Michael Cree</member> - <member>Michael Jansen</member> + <member>Matti Hamalainen</member> + <member>Max Schwarz</member> + <member>Maxim Iorsh</member> + <member>Mehdi Dogguy</member> + <member>meng</member> + <member>Michael Chang</member> + <member>Michael Larabel</member> <member>Michael Olbrich</member> - <member>Michael Ost</member> <member>Michael Stapelberg</member> - <member>Michael Vogt</member> + <member>Michael Thayer</member> <member>Michał Górny</member> + <member>Michal Marek</member> + <member>Michał Masłowski</member> + <member>Michal Suchanek</member> <member>Michel Dänzer</member> + <member>Michel Hummel</member> + <member>Mikael Magnusson</member> + <member>Mike Frysinger</member> + <member>Mike Stroyan</member> <member>Mikhail Gusarov</member> - <member>Nicolai Hähnle</member> - <member>Nicolas Boullis</member> - <member>Nicolas George</member> - <member>Nicolas Reinecke</member> - <member>Nigel Tamplin</member> - <member>Nirbheek Chauhan</member> + <member>Modestas Vainius</member> + <member>Mohammed Sameer</member> + <member>Nick Bowler</member> + <member>Nicolai Stange</member> + <member>Nicolas Cavallari</member> + <member>Nicolas Joly</member> + <member>Nicolas Kaiser</member> + <member>Nicolas Kalkhof</member> + <member>Nicolas Peninguy</member> + <member>Nikolai Kondrashov</member> + <member>Nils Wallménius</member> + <member>Nithin Nayak Sujir</member> + <member>Nobuhiro Iwamatsu</member> + <member>Olaf Buddenhagen</member> <member>Oldřich Jedlička</member> + <member>Oleh Nykyforchyn</member> <member>Oliver McFadden</member> - <member>Olivier Samyn</member> - <member>Osamu Sayama</member> - <member>Oswald Buddenhagen</member> - <member>Otavio Salvador</member> - <member>Owain G. Ainsworth</member> - <member>Owen W. Taylor</member> - <member>Patrick Caulfield</member> + <member>Oliver Schmidt</member> + <member>Olivier Fourdan</member> + <member>Olli Vertanen</member> + <member>Ondrej Zary</member> + <member>Owen Taylor</member> + <member>Pander</member> + <member>Pär Lidberg</member> + <member>Parag Nemade</member> <member>Patrick Curran</member> <member>Patrick E. Kane</member> - <member>Patrick Guimond</member> - <member>Paul Bender</member> - <member>Paul Loewenstein</member> - <member>Paul "TBBle" Hampson</member> + <member>Paul Fox</member> + <member>Paul Menzel</member> + <member>Paul Neumann</member> <member>Pauli Nieminen</member> - <member>Paulo César Pereira de Andrade</member> - <member>Paulo Ricardo Zanoni</member> + <member>Paulius Zaleckas</member> + <member>Paulo Zanoni</member> + <member>Pelle Johansson</member> + <member>Pete Beardmore</member> + <member>Peter Clifton</member> <member>Peter Harris</member> <member>Peter Hutterer</member> <member>Peter Korsgaard</member> - <member>Petr Salinger</member> - <member>Philippe Ribet</member> + <member>Peter Zotov</member> + <member>Philip Langdale</member> + <member>Philipp Reh</member> + <member>Phillp Haddad</member> <member>Pierre-Loup A. Griffais</member> + <member>Priit Laes</member> + <member>Promathesh Mandal</member> <member>Rami Ylimäki</member> + <member>Reinhard Karcher</member> <member>Rémi Cardona</member> - <member>Rémi Denis-Courmont</member> - <member>Richard Barnette</member> - <member>Richard Purdie</member> - <member>Rob Taylor</member> + <member>Richard Hartmann</member> + <member>Rob Clark</member> + <member>Robert Ancell</member> <member>Robert Bragg</member> <member>Robert Hooker</member> <member>Robert Morell</member> - <member>Roel Kluin</member> + <member>Roberto Branciforti</member> + <member>Roger Cruz</member> + <member>Roland Cassard</member> <member>Roland Scheidegger</member> - <member>Ruediger Oertel</member> - <member>Ryan Hajdaj</member> - <member>Sam Lau</member> - <member>Sami Farin</member> + <member>Roman Jarosz</member> + <member>Ross Burton</member> + <member>Rui Matos</member> + <member>Ryan Pavlik</member> + <member>Sam Spilsbury</member> <member>Samuel Thibault</member> <member>Sascha Hlusiak</member> + <member>Satoshi KImura</member> + <member>Scott James Remnant</member> + <member>Sebastian Glita</member> <member>Sedat Dilek</member> - <member>Shunichi Fuji</member> + <member>Sergey Samokhin</member> + <member>Sergey V. Udaltsov</member> + <member>Servaas Vandenberghe</member> + <member>Siddhesh Poyarekar</member> <member>Simon Farnsworth</member> + <member>Simon Que</member> <member>Simon Thum</member> + <member>Sitsofe Wheeler</member> <member>Søren Sandmann Pedersen</member> - <member>Thien-Thi Nguyen</member> - <member>Thomas Coppi</member> - <member>Thomas Hellstrom</member> - <member>Thomas Hunger</member> - <member>Thomas Jaeger</member> + <member>Stefan Dirsch</member> + <member>Stefan Glasenhardt</member> + <member>Stefan Kost</member> + <member>Stefan Potyra</member> + <member>Stephan Hilb</member> + <member>Stephane Marchesin</member> + <member>Stephen Turnbull</member> + <member>Stuart Kreitman</member> + <member>Takashi Iwai</member> + <member>Terry Lambert</member> + <member>Thierry Vignaud</member> + <member>Thomas Bächler</member> + <member>Thomas Fjellstrom</member> + <member>Thomas Hellström</member> + <member>Thomas Hoger</member> + <member>Thordur Bjornsson</member> <member>Tiago Vignatti</member> - <member>Tilman Sauerbeck</member> + <member>Till Matthiesen</member> + <member>Tim van der Molen</member> <member>Tim Yamin</member> <member>Timo Aaltonen</member> - <member>Timo Myyra</member> <member>Tobias Droste</member> - <member>Tobias Koch</member> <member>Tollef Fog Heen</member> + <member>Tom "spot" Callaway</member> + <member>Tom Fogal</member> <member>Tomas Carnecky</member> - <member>Tomáš Chvátal</member> + <member>Tomas Frydrych</member> + <member>Tomas Hoger</member> + <member>Tomáš Trnka</member> + <member>Toralf Förster</member> <member>Tormod Volden</member> <member>Trevor Woerner</member> + <member>U. Artie Eoff</member> + <member>Uli Schlachter</member> + <member>Ulrich Müller</member> + <member>Van de Bugger</member> + <member>Vasily Khoruzhick</member> + <member>Vasyĺ V. Vercynśkyj</member> + <member>Victor Machado</member> + <member>Ville Skyttä</member> <member>Ville Syrjälä</member> <member>Vincent Torri</member> + <member>Walter Bender</member> <member>Walter Harms</member> - <member>Will Thompson</member> - <member>Wolfram</member> - <member>Xavier Chantry</member> - <member>Xiaoyang Yu (Max)</member> + <member>William Jon McCann</member> + <member>Xavier Bachelot</member> + <member>Xiang, Haihao</member> + <member>Xue Wei</member> + <member>Xunx Fang</member> <member>Y.C. Chen</member> <member>Yaakov Selkowitz</member> - <member>Yang Zhao</member> <member>Yann Droneaud</member> <member>Yannick Heneault</member> - <member>Zephaniah E. Hull</member> + <member>Zack Rusin</member> <member>Zhao Yakui</member> + <member>Zhenyu Wang</member> + <member>Zhigang Gong</member> + <member>Zou Nan hai</member> </simplelist> + and the members of <ulink url="http://translationproject.org/">the + Translation Project</ulink>. </para> <para> diff --git a/doc/xorg-docs/general/Versions.xml b/doc/xorg-docs/general/Versions.xml index 913b56236..9c3f338e0 100644 --- a/doc/xorg-docs/general/Versions.xml +++ b/doc/xorg-docs/general/Versions.xml @@ -2,7 +2,7 @@ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ ]> -<article> +<article id='Versions'> <articleinfo> @@ -27,7 +27,7 @@ basic scheme is the same. This document reflects the policy that X.Org uses. </articleinfo> -<sect1> +<sect1 id='Module_Versions'> <title>Module Versions</title> <para> @@ -52,8 +52,8 @@ from 7.2 to 1.3. </para> </sect1> -<sect1> -<title>Releases, Development Streams and Branches</title> +<sect1 id='Releases_Development_Streams_and_Branches'> +<title>Releases, Development Streams, and Branches</title> <para> X.Org has two release branches for the X server software, and several @@ -95,7 +95,7 @@ has an identifiable version number. </sect1> -<sect1> +<sect1 id='Current_Version_Numbering_Scheme'> <title>Current Version Numbering Scheme</title> <para> @@ -116,7 +116,7 @@ present only for between-release snapshots of the development and stable branches. </para> -<sect2> +<sect2 id='Development_Branch'> <title>Development Branch</title> <para> @@ -198,7 +198,7 @@ branch snapshot after creating the 1.8 stable branch. </sect2> -<sect2> +<sect2 id='Stable_Branch'> <title>Stable Branch</title> <para> @@ -276,7 +276,7 @@ The 1.8.2 release. </sect1> -<sect1> +<sect1 id='Finding_the_X.Org_X_Server_Version_From_a_Client'> <title>Finding the X.Org X Server Version From a Client</title> <para> diff --git a/doc/xorg-docs/general/fonts/Makefile.am b/doc/xorg-docs/general/fonts/Makefile.am index 57f9bd2e3..4300cb748 100644 --- a/doc/xorg-docs/general/fonts/Makefile.am +++ b/doc/xorg-docs/general/fonts/Makefile.am @@ -1,10 +1,13 @@ + if ENABLE_DOCS -doc_sources = fonts.xml +# Main DocBook/XML files (DOCTYPE book) +docbook = fonts.xml -xmldir = $(docdir)/fonts -dist_xml_DATA = $(doc_sources) +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir)/fonts -include $(top_srcdir)/xmlrules.in +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am endif ENABLE_DOCS diff --git a/doc/xorg-docs/general/fonts/Makefile.in b/doc/xorg-docs/general/fonts/Makefile.in index f58ee02b4..7a8955585 100644 --- a/doc/xorg-docs/general/fonts/Makefile.in +++ b/doc/xorg-docs/general/fonts/Makefile.in @@ -15,26 +15,19 @@ @SET_MAKE@ # -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Generate output formats for a single DocBook/XML with/without chapters # -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: +# Variables set by the calling Makefile: +# shelfdir: the location where the docs/specs are installed. Typically $(docdir) +# docbook: the main DocBook/XML file, no chapters, appendix or image files +# chapters: all files pulled in by an XInclude statement and images. # -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. + # -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. +# This makefile is intended for Users Documentation and Functional Specifications. +# Do not use for Developer Documentation which is not installed and does not require olink. +# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 +# for an explanation on documents classification. # srcdir = @srcdir@ @@ -46,9 +39,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +install_sh_DATA = ${SHELL} $(install_sh) -c -m 644 +install_sh_PROGRAM = ${SHELL} $(install_sh) -c +install_sh_SCRIPT = ${SHELL} $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) transform = $(program_transform_name) NORMAL_INSTALL = : @@ -59,10 +52,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(am__dist_xml_DATA_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/xmlrules.in -@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(doc_sources:.xml=.txt) +DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/docbook.am +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) subdir = general/fonts ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -72,17 +69,17 @@ mkinstalldirs = $(SHELL) $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__dist_xml_DATA_DIST = fonts.xml +am__dist_shelf_DATA_DIST = fonts.xml am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)" -dist_xmlDATA_INSTALL = $(INSTALL_DATA) -xmlDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_xml_DATA) $(xml_DATA) +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" +dist_shelfDATA_INSTALL = $(INSTALL_DATA) +shelfDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_shelf_DATA) $(shelf_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ @@ -97,6 +94,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -130,6 +128,8 @@ HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@ HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@ HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@ HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@ +HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@ +HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@ INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -160,12 +160,14 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -210,26 +212,73 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@ENABLE_DOCS_TRUE@doc_sources = fonts.xml -@ENABLE_DOCS_TRUE@xmldir = $(docdir)/fonts -@ENABLE_DOCS_TRUE@dist_xml_DATA = $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@xml_DATA = \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(doc_sources:.xml=.html) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_1) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_2) -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -m $(XSL_STYLESHEET) \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath $(XORG_SGML_PATH)/X11 \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam img.src.path=$(abs_builddir)/ - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@SUFFIXES = .xml .ps .pdf .txt .html + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_DOCS_TRUE@docbook = fonts.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_DOCS_TRUE@shelfdir = $(docdir)/fonts + +# DocBook/XML generated output formats to be installed +@ENABLE_DOCS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_DOCS_TRUE@ $(am__append_3) $(am__append_4) + +# DocBook/XML file with chapters, appendix and images it includes +@ENABLE_DOCS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) + + +# Generate documents cross-reference target databases +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +@ENABLE_DOCS_TRUE@CLEANFILES = $(shelf_DATA) all: all-am .SUFFIXES: -.SUFFIXES: .xml .ps .pdf .txt .html -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/xmlrules.in $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -259,39 +308,39 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-dist_xmlDATA: $(dist_xml_DATA) +install-dist_shelfDATA: $(dist_shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(dist_xml_DATA)'; for p in $$list; do \ + test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)" + @list='$(dist_shelf_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(dist_xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(dist_xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-dist_xmlDATA: +uninstall-dist_shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_xml_DATA)'; for p in $$list; do \ + @list='$(dist_shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-xmlDATA: $(xml_DATA) +install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(xml_DATA)'; for p in $$list; do \ + test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)" + @list='$(shelf_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-xmlDATA: +uninstall-shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(xml_DATA)'; for p in $$list; do \ + @list='$(shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done tags: TAGS TAGS: @@ -332,7 +381,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -360,11 +409,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_DOCS_FALSE@clean-local: -@HAVE_XMLTO_FALSE@clean-local: clean: clean-am -clean-am: clean-generic clean-local mostlyclean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -380,7 +427,7 @@ info: info-am info-am: -install-data-am: install-dist_xmlDATA install-xmlDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -406,37 +453,33 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_xmlDATA uninstall-info-am \ - uninstall-xmlDATA - -.PHONY: all all-am check check-am clean clean-generic clean-local \ - distclean distclean-generic distdir dvi dvi-am html html-am \ - info info-am install install-am install-data install-data-am \ - install-dist_xmlDATA install-exec install-exec-am install-info \ - install-info-am install-man install-strip install-xmlDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-dist_xmlDATA \ - uninstall-info-am uninstall-xmlDATA - - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@clean-local: -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)rm -fr html/ +uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ + uninstall-shelfDATA + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-exec install-exec-am \ + install-info install-info-am install-man install-shelfDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< + +# Generate DocBook/XML output formats with or without stylesheets # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/xorg-docs/general/fonts/fonts.xml b/doc/xorg-docs/general/fonts/fonts.xml index 72c07238f..0f58d5dcd 100644 --- a/doc/xorg-docs/general/fonts/fonts.xml +++ b/doc/xorg-docs/general/fonts/fonts.xml @@ -2,38 +2,39 @@ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ -<!ENTITY % defs SYSTEM "/xorg-sgml-doctools/X11/defs.ent"> %defs; +<!ENTITY % defs SYSTEM "defs.ent"> %defs; ]> -<article> +<article id='fonts'> <articleinfo> <title>Fonts in X11R&relvers;</title> +<releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> <author><firstname>Juliusz</firstname><surname>Chroboczek</surname> <email>jch@freedesktop.org</email> </author> -<pubdate>23 October 2009</pubdate> +<pubdate>16 March 2012</pubdate> </articleinfo> -<sect1> +<sect1 id='Introduction'> <title>Introduction</title> <para> This document describes the support for fonts in X11R&relvers;. -<xref linkend="sec-installing"/> is aimed at the +<xref linkend='Installing_fonts' xrefstyle='select: title'/> is aimed at the casual user wishing to install fonts in X11R&relvers; the rest of the document describes the font support in more detail. </para> <para> We assume some familiarity with digital fonts. If anything is not -clear to you, please consult <xref linkend="sec-background" /> at the +clear to you, please consult <xref linkend='Appendix_background_and_terminology' xrefstyle='select: title'/> at the end of this document for background information. </para> -<sect2> +<sect2 id='Two_font_systems'> <title>Two font systems</title> <para> @@ -72,7 +73,7 @@ possible. </sect1> -<sect1 id="sec-installing" xreflabel="Installing fonts"> +<sect1 id='Installing_fonts'> <title>Installing fonts</title> <para> @@ -80,7 +81,7 @@ This section explains how to configure both Xft and the core fonts system to access newly-installed fonts. </para> -<sect2 id="sec-configuring-xft"> +<sect2 id='Configuring_Xft'> <title>Configuring Xft</title> <para> @@ -91,14 +92,14 @@ not specific to the X Window system, and does not rely on any particular font output mechanism. </para> -<sect3> +<sect3 id='Installing_fonts_in_Xft'> <title>Installing fonts in Xft</title> <para> Fontconfig looks for fonts in a set of well-known directories that include all of X11R&relvers;'s standard font directories -(`<filename>/usr/share/fonts/X11/*</filename>') by default) as well as a -directory called `<filename>.fonts/</filename>' in the user's home directory. +(<quote><filename>/usr/share/fonts/X11/*</filename></quote>) by default) as well as a +directory called <quote><filename>.fonts/</filename></quote> in the user's home directory. Installing a font for use by Xft applications is as simple as copying a font file into one of these directories. @@ -108,7 +109,7 @@ $ cp lucbr.ttf ~/.fonts/ Fontconfig will notice the new font at the next opportunity and rebuild its list of fonts. If you want to trigger this update from the command -line, you may run the command `<command>fc-cache</command>'. +line, you may run the command <quote><command>fc-cache</command></quote>. <screen> $ fc-cache @@ -128,16 +129,16 @@ $ su -c fc-cache </sect3> -<sect3> +<sect3 id='Fine-tuning_Xft'> <title>Fine-tuning Xft</title> <para> Fontconfig's behaviour is controlled by a set of configuration -files: a standard configuration file, `<filename>/etc/fonts/fonts.conf</filename>', -a host-specific configuration file, `<filename>/etc/fonts/local.conf</filename>', -and a user-specific file called `<filename>.fonts.conf</filename>' in the user's +files: a standard configuration file, <quote><filename>/etc/fonts/fonts.conf</filename></quote>, +a host-specific configuration file, <quote><filename>/etc/fonts/local.conf</filename></quote>, +and a user-specific file called <quote><filename>.fonts.conf</filename></quote> in the user's home directory (this can be overridden with the -`<envar>FONTCONFIG_FILE</envar>' environment variable). +<quote><envar>FONTCONFIG_FILE</envar></quote> environment variable). </para> <para> @@ -161,7 +162,7 @@ following line: <para> The default Fontconfig configuration file includes the directory -`<filename>˜/.fonts/</filename>' in the list of directories searched for font +<quote><filename>˜/.fonts/</filename></quote> in the list of directories searched for font files, and this is where user-specific font files should be installed. In the unlikely case that a new font directory needs to be added, this can be done with the following syntax: @@ -222,18 +223,18 @@ syntax: </match> </screen> -The string `<literal remap="tt">rgb</literal>' within the -`<literal remap="tt"><const></literal>'...`<literal remap="tt"></const></literal>' +The string <quote><literal remap="tt">rgb</literal></quote> within the +<quote><literal remap="tt"><const></literal></quote>...<quote><literal remap="tt"></const></literal></quote> specifies the order of pixel components on your display, and should be -changed to match your hardware; it can be one of `<literal remap="tt">rgb</literal> (normal -LCD screen), `<literal remap="tt">bgr</literal>' (backwards LCD screen), `<literal remap="tt">vrgb</literal>' (LCD -screen rotated clockwise) or `<literal remap="tt">vbgr</literal>' (LCD screen rotated +changed to match your hardware; it can be one of <quote><literal remap="tt">rgb</literal></quote> (normal +LCD screen), <quote><literal remap="tt">bgr</literal></quote> (backwards LCD screen), <quote><literal remap="tt">vrgb</literal></quote> (LCD +screen rotated clockwise) or <quote><literal remap="tt">vbgr</literal></quote> (LCD screen rotated counterclockwise). </para> </sect3> -<sect3> +<sect3 id='Configuring_applications'> <title>Configuring applications</title> <para> @@ -244,7 +245,7 @@ configured to use Xft. <para> A case in point is XTerm, which can be set to use Xft by using the -`<literal remap="tt">-fa</literal>' command line option or by setting the `<literal remap="tt">XTerm*faceName</literal>' +<quote><literal remap="tt">-fa</literal></quote> command line option or by setting the <quote><literal remap="tt">XTerm*faceName</literal></quote> resource: <screen> @@ -260,8 +261,8 @@ $ xterm -fa "Courier" </para> <para> -For KDE applications, you should select ``Anti-alias fonts'' in the -``Fonts'' panel of KDE's ``Control Center''. Note that this option is +For KDE applications, you should select <quote>Anti-alias fonts</quote> in the +<quote>Fonts</quote> panel of KDE's <quote>Control Center</quote>. Note that this option is misnamed: it switches KDE to using Xft but doesn't enable anti-aliasing in case it was disabled by your Xft configuration file. </para> @@ -274,7 +275,7 @@ Gnome applications and Mozilla Firefox will use Xft by default. </sect2> -<sect2> +<sect2 id='Configuring_the_core_X11_fonts_system'> <title>Configuring the core X11 fonts system</title> <para> @@ -285,7 +286,7 @@ inform the X server of the existence of this new directory by including it in the <emphasis remap="it">font path</emphasis>. </para> -<sect3> +<sect3 id='Installing_bitmap_fonts'> <title>Installing bitmap fonts</title> <para> @@ -298,13 +299,13 @@ BDF format and the somewhat more efficient binary PCF format. Bitmap fonts are normally distributed in the BDF format. Before installing such fonts, it is desirable (but not absolutely necessary) to convert the font files to the PCF format. This is done by using the -command `<command>bdftopcf</command>', <emphasis remap="it">e.g.</emphasis> +command <quote><command>bdftopcf</command></quote>, <emphasis remap="it">e.g.</emphasis> <screen> $ bdftopcf courier12.bdf </screen> -You will then want to compress the resulting PCF font files: +You may then want to compress the resulting PCF font files: <screen> $ gzip courier12.pcf @@ -315,8 +316,8 @@ $ gzip courier12.pcf <para> After the fonts have been converted, you should copy all the font files that you wish to make available into a arbitrary directory, say -`<filename>/usr/local/share/fonts/bitmap/</filename>'. You should then create the -index file `<filename>fonts.dir</filename>' by running the command `<command>mkfontdir</command>' +<quote><filename>/usr/local/share/fonts/bitmap/</filename></quote>. You should then create the +index file <quote><filename>fonts.dir</filename></quote> by running the command <quote><command>mkfontdir</command></quote> (please see the <ulink url="mkfontdir.1.html" >mkfontdir(1)</ulink @@ -333,12 +334,12 @@ $ mkfontdir /usr/local/share/fonts/bitmap/ <para> All that remains is to tell the X server about the existence of the -new font directory; see <xref linkend="sec-set-font-path"/> below. +new font directory; see <xref linkend='Setting_the_servers_font_path' xrefstyle='select: title'/> below. </para> </sect3> -<sect3> +<sect3 id='Installing_scalable_fonts'> <title>Installing scalable fonts</title> <para> @@ -350,16 +351,16 @@ CID scalable font formats, but that is not included in current releases.) <para> Installing scalable fonts is very similar to installing bitmap fonts: -you create a directory with the font files, and run `<command>mkfontdir</command>' -to create an index file called `<filename>fonts.dir</filename>'. +you create a directory with the font files, and run <quote><command>mkfontdir</command></quote> +to create an index file called <quote><filename>fonts.dir</filename></quote>. </para> <para> -There is, however, a big difference: `<command>mkfontdir</command>' cannot +There is, however, a big difference: <quote><command>mkfontdir</command></quote> cannot automatically recognise scalable font files. For that reason, you must first index all the font files in a file called -`<filename>fonts.scale</filename>'. While this can be done by hand, it is best done -by using the `<command>mkfontscale</command>' utility. +<quote><filename>fonts.scale</filename></quote>. While this can be done by hand, it is best done +by using the <quote><command>mkfontscale</command></quote> utility. <screen> $ mkfontscale /usr/local/share/fonts/Type1/ @@ -367,21 +368,21 @@ $ mkfontdir /usr/local/share/fonts/Type1/ </screen> Under some circumstances, it may be necessary to modify the -`<filename>fonts.scale</filename>' file generated by <command>mkfontscale</command>; for more +<quote><filename>fonts.scale</filename></quote> file generated by <command>mkfontscale</command>; for more information, please see the <ulink url="mkfontdir.1.html" >mkfontdir(1)</ulink > and <ulink url="mkfontscale.1.html" >mkfontscale(1)</ulink -> manual pages and <xref linkend="sec-internationalisation"/> +> manual pages and <xref linkend='Core_fonts_and_internationalisation' xrefstyle='select: title'/> later in this document. </para> </sect3> -<sect3 id="sec-cid-fonts" xreflabel="Installing CIDFonts"> -<title>CID-keyed fonts </title> +<sect3 id='CID_keyed_fonts'> +<title>CID-keyed fonts</title> <para> The CID-keyed font format was designed by Adobe Systems for fonts @@ -392,8 +393,8 @@ support for CID-keyed fonts has been removed from X11. </sect3> -<sect3 id="sec-set-font-path" xreflabel="Setting the server font path"> -<title>Setting the server's font path </title> +<sect3 id='Setting_the_servers_font_path'> +<title>Setting the server's font path</title> <para> The list of directories where the server looks for fonts is known @@ -413,7 +414,7 @@ the second, it searches for fonts suitable for scaling. For best results, scalable fonts should appear in the font path before the bitmap fonts; this way, the server will prefer bitmap fonts to scalable fonts when an exact match is possible, but will avoid scaling -bitmap fonts when a scalable font can be used. (The `<literal remap="tt">:unscaled</literal>' +bitmap fonts when a scalable font can be used. (The <quote><literal remap="tt">:unscaled</literal></quote> hack, while still supported, should no longer be necessary in X11R&relvers;.) </para> @@ -426,7 +427,7 @@ $ xset q </para> -<sect4> +<sect4 id='Font_path_catalogue_directories'> <title>Font path catalogue directories</title> <para> @@ -471,11 +472,11 @@ setting the following font path: </para> </sect4> -<sect4> +<sect4 id='Temporary_modification_of_the_font_path'> <title>Temporary modification of the font path</title> <para> -The `<command>xset</command>' utility may be used to modify the font path for the +The <quote><command>xset</command></quote> utility may be used to modify the font path for the current session. The font path is set with the command <command>xset fp</command>; a new element is added to the front with <command>xset +fp</command>, and added to the end with <command>xset fp+</command>. For example, @@ -489,9 +490,9 @@ $ xset fp+ /usr/local/fonts/bitmap <para> Conversely, an element may be removed from the front of the font path -with `<command>xset -fp</command>', and removed from the end with `<command>xset fp-</command>'. +with <quote><command>xset -fp</command></quote>, and removed from the end with <quote><command>xset fp-</command></quote>. You may reset the font path to its default value with -`<command>xset fp default</command>'. +<quote><command>xset fp default</command></quote>. </para> <para> @@ -503,16 +504,16 @@ url="xset.1.html" </sect4> -<sect4> +<sect4 id='Permanent_modification_of_the_font_path'> <title>Permanent modification of the font path</title> <para> The default font path (the one used just after server startup or -after `<command>xset fp default</command>') may be specified in the +after <quote><command>xset fp default</command></quote>) may be specified in the X server's -`<filename>xorg.conf</filename>' file. It is computed by appending all the -directories mentioned in the `<literal remap="tt">FontPath</literal>' entries of the -`<literal remap="tt">Files</literal>' section in the order in which they appear. If no font path is specified in a config file, the server uses a default +<quote><filename>xorg.conf</filename></quote> file. It is computed by appending all the +directories mentioned in the <quote><literal remap="tt">FontPath</literal></quote> entries of the +<quote><literal remap="tt">Files</literal></quote> section in the order in which they appear. If no font path is specified in a config file, the server uses a default value specified when it was built. <screen> @@ -534,12 +535,12 @@ url="xorg.conf.5.html" </sect3> -<sect3 id="sec-troubleshooting-core"> -<title>Troubleshooting </title> +<sect3 id='Troubleshooting'> +<title>Troubleshooting</title> <para> If you seem to be unable to use some of the fonts you have -installed, the first thing to check is that the `<filename>fonts.dir</filename>' files +installed, the first thing to check is that the <quote><filename>fonts.dir</filename></quote> files are correct and that they are readable by the server (the X server usually runs as root, beware of NFS-mounted font directories). If this doesn't help, it is quite possible that you are trying to use a @@ -563,21 +564,21 @@ these modules: <para> <literal remap="tt">"bitmap"</literal>: - bitmap fonts (`<filename>*.bdf</filename>', - `<filename>*.pcf</filename>' - and `<filename>*.snf</filename>'); + bitmap fonts (<quote><filename>*.bdf</filename></quote>, + <quote><filename>*.pcf</filename></quote> + and <quote><filename>*.snf</filename></quote>); </para> </listitem> <listitem> <para> <literal remap="tt">"freetype"</literal>: - TrueType fonts (`<filename>*.ttf</filename>' and - `<filename>*.ttc</filename>'), - OpenType fonts (`<filename>*.otf</filename>' and - `<filename>*.otc</filename>') and - Type 1 fonts (`<filename>*.pfa</filename>' - and `<filename>*.pfb</filename>'). + TrueType fonts (<quote><filename>*.ttf</filename></quote> and + <quote><filename>*.ttc</filename></quote>), + OpenType fonts (<quote><filename>*.otf</filename></quote> and + <quote><filename>*.otc</filename></quote>) and + Type 1 fonts (<quote><filename>*.pfa</filename></quote> + and <quote><filename>*.pfb</filename></quote>). </para> </listitem> @@ -591,15 +592,15 @@ these modules: </sect1> -<sect1> +<sect1 id='Fonts_included_with_X11'> <title>Fonts included with X11R&relvers;</title> -<sect2> +<sect2 id='Standard_bitmap_fonts'> <title>Standard bitmap fonts</title> <para> The Sample Implementation of X11 (SI) comes with a large number of -bitmap fonts, including the `<literal remap="tt">fixed</literal>' family, and bitmap versions +bitmap fonts, including the <quote><literal remap="tt">fixed</literal></quote> family, and bitmap versions of Courier, Times, Helvetica and some members of the Lucida family. </para> @@ -624,7 +625,7 @@ with XLFD -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1 </screen> -is a Unicode-encoded version of the standard `<literal remap="tt">fixed</literal>' font with +is a Unicode-encoded version of the standard <quote><literal remap="tt">fixed</literal></quote> font with added support for the Latin, Greek, Cyrillic, Georgian, Armenian, IPA and other scripts plus numerous technical symbols. It contains over 2800 glyphs, covering all characters of ISO 8859 parts 1-5, @@ -652,7 +653,7 @@ with respective XLFDs -misc-fixed-medium-r-normal--13-120-75-75-c-60-koi8-r </screen> -The standard short name `<literal remap="tt">fixed</literal>' is normally an alias for +The standard short name <quote><literal remap="tt">fixed</literal></quote> is normally an alias for <screen> -misc-fixed-medium-r-normal--13-120-75-75-c-60-iso8859-1 @@ -662,7 +663,7 @@ The standard short name `<literal remap="tt">fixed</literal>' is normally an ali </sect2> -<sect2> +<sect2 id='The_ClearlyU_Unicode_font_family'> <title>The ClearlyU Unicode font family</title> <para> @@ -721,14 +722,14 @@ may be useful for improved presentation of text. </sect2> -<sect2> +<sect2 id='Standard_scalable_fonts'> <title>Standard scalable fonts</title> <para> X11R&relvers; includes all the scalable fonts distributed with X11R6. </para> -<sect3> +<sect3 id='Standard_Type1_fonts'> <title>Standard Type 1 fonts</title> <para> @@ -785,7 +786,7 @@ and reside in the font files </sect2> -<sect2> +<sect2 id='The_Bigelow_and__Holmes_Luxi_family'> <title>The Bigelow & Holmes Luxi family</title> <para> @@ -839,8 +840,10 @@ of core fonts bundled with popular operating and window systems. <para> The license terms for the Luxi fonts are included in the file -`<filename>COPYRIGHT.BH</filename>', as well as in the <ulink -url="../LICENSE.html">License document</ulink>. +<quote><filename>COPYRIGHT.BH</filename></quote>, as well as in the <olink +targetdoc='License' +targetptr='Bigelow_Holmes_Inc_and_URW_GmbH_Luxi_font_license'>License +document</olink>. </para> <para> @@ -872,22 +875,21 @@ name have been removed from X11R&relvers;. </sect1> -<sect1 id="sec-more-core"> -<title>More about core fonts </title> +<sect1 id='More_about_core_fonts'> +<title>More about core fonts</title> <para> -This section describes X11R&relvers;-specific enhancements to the core -X11 fonts system. +This section describes XFree86-created enhancements to the core +X11 fonts system that were adopted by X.Org. </para> -<sect2 id="sec-internationalisation" xreflabel="Core fonts and -internationalisation"> -<title>Core fonts and internationalisation </title> +<sect2 id='Core_fonts_and_internationalisation'> +<title>Core fonts and internationalisation</title> <para> The scalable font backends (Type 1 and TrueType) can automatically re-encode fonts to the encoding specified in the -XLFD in `<filename>fonts.dir</filename>'. For example, a `<filename>fonts.dir</filename>' file can +XLFD in <quote><filename>fonts.dir</filename></quote>. For example, a <quote><filename>fonts.dir</filename></quote> file can contain entries for the Type 1 Courier font such as <screen> @@ -899,8 +901,8 @@ which will lead to the font being recoded to ISO 8859-1 and ISO 8859-2 respectively. </para> -<sect3 id="sec-fontenc"> -<title>The <emphasis remap="it">fontenc</emphasis> layer </title> +<sect3 id='The_fontenc_layer'> +<title>The <emphasis remap="it">fontenc</emphasis> layer</title> <para> Two of the scalable backends (Type 1 and the @@ -913,7 +915,7 @@ font type. <para> <emphasis remap="it">Please note:</emphasis> the X-TrueType (X-TT) backend is not included in X11R&relvers;. That functionality has been merged into the FreeType -backend.> +backend. </para> <para> @@ -922,7 +924,7 @@ In the <emphasis remap="it">fontenc</emphasis> layer, an encoding is defined by an ordered collection of mappings. A mapping defines the way the encoding can be mapped into one of the <emphasis remap="it">target encodings</emphasis> known to <emphasis remap="it">fontenc</emphasis>; currently, these consist of Unicode, Adobe glyph names, -and arbitrary TrueType ``cmap''s. +and arbitrary TrueType <quote>cmap</quote>s. </para> <para> @@ -1025,14 +1027,14 @@ Western-European); <listitem> <para> - <literal remap="tt">koi8-uni</literal>: KOI8 ``Unified'' (Russian, Ukrainian, and + <literal remap="tt">koi8-uni</literal>: KOI8 <quote>Unified</quote> (Russian, Ukrainian, and Byelorussian); </para> </listitem> <listitem> <para> - <literal remap="tt">koi8-e</literal>: KOI8 ``European,'' ISO-IR-111, or ECMA-Cyrillic; + <literal remap="tt">koi8-e</literal>: KOI8 <quote>European,</quote> ISO-IR-111, or ECMA-Cyrillic; </para> </listitem> <listitem> @@ -1052,11 +1054,11 @@ Additional encodings can be added by defining <emphasis remap="it">encoding file When a font encoding is requested that the <emphasis remap="it">fontenc</emphasis> layer doesn't know about, the backend checks the directory in which the font file resides (not necessarily the directory with <filename>fonts.dir</filename>!) for a -file named `<filename>encodings.dir</filename>'. If found, this file is scanned for +file named <quote><filename>encodings.dir</filename></quote>. If found, this file is scanned for the requested encoding, and the relevant encoding definition file is -read in. The `<command>mkfontdir</command>' utility, when invoked with the -`<literal remap="tt">-e</literal>' option followed by the name of a directory containing -encoding files, can be used to automatically build `<filename>encodings.dir</filename>' +read in. The <quote><command>mkfontdir</command></quote> utility, when invoked with the +<quote><literal remap="tt">-e</literal></quote> option followed by the name of a directory containing +encoding files, can be used to automatically build <quote><filename>encodings.dir</filename></quote> files. Please see the <ulink url="mkfontdir.1.html" >mkfontdir(1)</ulink @@ -1067,16 +1069,17 @@ manual page for more details. <para> A number of encoding files for common encodings are included with X11R&relvers;. Information on writing new encoding files can be found in -<xref linkend="sec-format-encoding-directory-files"/> and <xref linkend="sec-format-encoding-files"/> later in this document. +<xref linkend='Format_of_encoding_directory_files' xrefstyle='select: title'/> +and <xref linkend='Format_of_encoding_files' xrefstyle='select: title'/> later in this document. </para> </sect3> -<sect3> +<sect3 id='Backend-specific_notes_about_fontenc'> <title>Backend-specific notes about fontenc</title> -<sect4 id="sec-fontenc-freetype"> -<title>The <emphasis remap="it">FreeType</emphasis> backend </title> +<sect4 id='The_FreeType_backend'> +<title>The <emphasis remap="it">FreeType</emphasis> backend</title> <para> For TrueType and OpenType fonts, the FreeType backend scans the @@ -1097,7 +1100,8 @@ points that have been assigned names by Adobe. <para> Specifying an encoding value of <literal remap="tt">adobe-fontspecific</literal> for a Type 1 font disables the encoding mechanism. This is useful with -symbol and incorrectly encoded fonts (see <xref linkend="sec-incorrect-encoding"/> below). +symbol and incorrectly encoded fonts (see +<xref linkend='Hints_about_using_badly_encoded_fonts' xrefstyle='select: title'/> below). </para> <para> @@ -1109,20 +1113,19 @@ ISO 8859-1. </sect3> -<sect3 id="sec-format-encoding-directory-files" xreflabel="Format of -encodings directory files"> -<title>Format of encoding directory files </title> +<sect3 id='Format_of_encoding_directory_files'> +<title>Format of encoding directory files</title> <para> In order to use a font in an encoding that the font backend does -not know about, you need to have an `<filename>encodings.dir</filename>' file either +not know about, you need to have an <quote><filename>encodings.dir</filename></quote> file either in the same directory as the font file used or in a system-wide -location (`<filename>/usr/share/fonts/X11/encodings/</filename>' by default). +location (<quote><filename>/usr/share/fonts/X11/encodings/</filename></quote> by default). </para> <para> -The `<filename>encodings.dir</filename>' file has a similar format to -`<filename>fonts.dir</filename>'. Its first line specifies the number of encodings, +The <quote><filename>encodings.dir</filename></quote> file has a similar format to +<quote><filename>fonts.dir</filename></quote>. Its first line specifies the number of encodings, while every successive line has two columns, the name of the encoding, and the name of the encoding file; this can be relative to the current directory, or absolute. Every encoding name should agree with the @@ -1142,8 +1145,8 @@ mulearabic-2 /usr/share/fonts/X11/encodings/mulearabic-2.enc <para> The name of an encoding <emphasis remap="it">must</emphasis> be specified in the encoding file's -`<literal remap="tt">STARTENCODING</literal>' or `<literal remap="tt">ALIAS</literal>' line. It is not enough to create -an `<filename>encodings.dir</filename>' entry. +<quote><literal remap="tt">STARTENCODING</literal></quote> or <quote><literal remap="tt">ALIAS</literal></quote> line. It is not enough to create +an <quote><filename>encodings.dir</filename></quote> entry. </para> <para> @@ -1152,8 +1155,8 @@ compressed or gzipped. </para> <para> -The `<filename>encoding.dir</filename>' files are best maintained by the -`<command>mkfontdir</command>' utility. Please see the <ulink +The <quote><filename>encoding.dir</filename></quote> files are best maintained by the +<quote><command>mkfontdir</command></quote> utility. Please see the <ulink url="mkfontdir.1.html" >mkfontdir(1)</ulink > manual page for more information. @@ -1161,26 +1164,26 @@ url="mkfontdir.1.html" </sect3> -<sect3 id="sec-format-encoding-files" xreflabel="Format of encoding files"> -<title>Format of encoding files </title> +<sect3 id='Format_of_encoding_files'> +<title>Format of encoding files</title> <para> -The encoding files are ``free form,'' <emphasis remap="it">i.e.</emphasis> any string of +The encoding files are <quote>free form,</quote> <emphasis remap="it">i.e.</emphasis> any string of whitespace is equivalent to a single space. Keywords are parsed in a -non-case-sensitive manner, meaning that `<literal remap="tt">size</literal>', `<literal remap="tt">SIZE</literal>', and -`<literal remap="tt">SiZE</literal>' all parse as the same keyword; on the other hand, case is +non-case-sensitive manner, meaning that <quote><literal remap="tt">size</literal></quote>, <quote><literal remap="tt">SIZE</literal></quote>, and +<quote><literal remap="tt">SiZE</literal></quote> all parse as the same keyword; on the other hand, case is significant in glyph names. </para> <para> -Numbers can be written in decimal, as in `<literal remap="tt">256</literal>', in hexadecimal, -as in `<literal remap="tt">0x100</literal>', or in octal, as in `<literal remap="tt">0400</literal>'. +Numbers can be written in decimal, as in <quote><literal remap="tt">256</literal></quote>, in hexadecimal, +as in <quote><literal remap="tt">0x100</literal></quote>, or in octal, as in <quote><literal remap="tt">0400</literal></quote>. </para> <para> -Comments are introduced by a hash sign `<literal remap="tt">#</literal>'. A `<literal remap="tt">#</literal>' may +Comments are introduced by a hash sign <quote><literal remap="tt">#</literal></quote>. A <quote><literal remap="tt">#</literal></quote> may appear at any point in a line, and all characters following the -`<literal remap="tt">#</literal>' are ignored, up to the end of the line. +<quote><literal remap="tt">#</literal></quote> are ignored, up to the end of the line. </para> <para> @@ -1193,7 +1196,7 @@ ALIAS arabic-0 </screen> The name of the encoding and its aliases should be suitable for use in -an XLFD font name, and therefore contain exactly one dash `<literal remap="tt">-</literal>'. +an XLFD font name, and therefore contain exactly one dash <quote><literal remap="tt">-</literal></quote>. </para> <para> @@ -1207,7 +1210,7 @@ SIZE 0x2B For a matrix encoding, it should specify two numbers. The first is the number of the last row plus one, the other, the highest column -number plus one. In the case of `<literal remap="tt">jisx0208.1990-0</literal>' +number plus one. In the case of <quote><literal remap="tt">jisx0208.1990-0</literal></quote> (JIS X 0208(1990), double-byte encoding, high bit clear), it should be @@ -1215,36 +1218,36 @@ should be SIZE 0x75 0x80 </screen> -In the case of a matrix encoding, a `<literal remap="tt">FIRSTINDEX</literal>' line may be +In the case of a matrix encoding, a <quote><literal remap="tt">FIRSTINDEX</literal></quote> line may be included to specify the minimum glyph index in an encoding. The -keyword `<literal remap="tt">FIRSTINDEX</literal>' is followed by two integers, the minimum row +keyword <quote><literal remap="tt">FIRSTINDEX</literal></quote> is followed by two integers, the minimum row number followed by the minimum column number: <screen> FIRSTINDEX 0x20 0x20 </screen> -In the case of a linear encoding, a `<literal remap="tt">FIRSTINDEX</literal>' line is not very +In the case of a linear encoding, a <quote><literal remap="tt">FIRSTINDEX</literal></quote> line is not very useful. If for some reason however you chose to include on, it should be followed by a single integer. </para> <para> -Note that in most font backends inclusion of a `<literal remap="tt">FIRSTINDEX</literal>' line +Note that in most font backends inclusion of a <quote><literal remap="tt">FIRSTINDEX</literal></quote> line has the side effect of disabling default glyph generation, and this keyword should therefore be avoided unless absolutely necessary. </para> <para> -Codes outside the region defined by the `<literal remap="tt">SIZE</literal>' and -`<literal remap="tt">FIRSTINDEX</literal>' lines are understood to be undefined. Encodings +Codes outside the region defined by the <quote><literal remap="tt">SIZE</literal></quote> and +<quote><literal remap="tt">FIRSTINDEX</literal></quote> lines are understood to be undefined. Encodings default to linear encoding with a size of 256 (0x100). This means that you must declare the size of all 16 bit encodings. </para> <para> What follows is one or more mapping sections. A mapping section -starts with a `<literal remap="tt">STARTMAPPING</literal>' line stating the target of the mapping. +starts with a <quote><literal remap="tt">STARTMAPPING</literal></quote> line stating the target of the mapping. The target may be one of: <itemizedlist> @@ -1262,7 +1265,7 @@ STARTMAPPING unicode <listitem> <para> -a given TrueType ``cmap'': +a given TrueType <quote>cmap</quote>: <screen> STARTMAPPING cmap 3 1 @@ -1337,7 +1340,7 @@ is an abbreviation for Codes not listed are assumed to map through the identity (<emphasis remap="it">i.e.</emphasis> to the same numerical value). In order to override this default mapping, you may specify a range of codes to be undefined by using an -`<literal remap="tt">UNDEFINE</literal>' line: +<quote><literal remap="tt">UNDEFINE</literal></quote> line: <screen> UNDEFINE 0x00 0x2A @@ -1388,8 +1391,8 @@ sections with an unknown target. </sect3> -<sect3 id="sec-symbol-fonts"> -<title>Using symbol fonts </title> +<sect3 id='Using_symbol_fonts'> +<title>Using symbol fonts</title> <para> Type 1 symbol fonts should be installed using the @@ -1409,13 +1412,13 @@ In order to guarantee consistent results (especially between Type 1 and TrueType versions of the same font), it is possible to define a special encoding for a given font. This has already been done for the <literal remap="tt">ZapfDingbats</literal> font; see the file -`<filename>encodings/adobe-dingbats.enc</filename>'. +<quote><filename>encodings/adobe-dingbats.enc</filename></quote>. </para> </sect3> -<sect3 id="sec-incorrect-encoding" xreflabel="Incorrectly encoded fonts"> -<title>Hints about using badly encoded fonts </title> +<sect3 id='Hints_about_using_badly_encoded_fonts'> +<title>Hints about using badly encoded fonts</title> <para> A number of text fonts are incorrectly encoded. Incorrect encoding @@ -1433,56 +1436,56 @@ encoding they were designed for, and creating an <emphasis remap="it">ad hoc</em file. </para> -<sect4> +<sect4 id='Using_fonts_with_the_designers_encoding'> <title>Using fonts with the designer's encoding</title> <para> In the case of Type 1 fonts, the font designer can specify a default encoding; this encoding is requested by using the -`<literal remap="tt">adobe-fontspecific</literal>' encoding in the XLFD name. Sometimes, the +<quote><literal remap="tt">adobe-fontspecific</literal></quote> encoding in the XLFD name. Sometimes, the font designer omitted to specify a reasonable default encoding, in -which case you should experiment with `<literal remap="tt">adobe-standard</literal>', -`<literal remap="tt">iso8859-1</literal>', `<literal remap="tt">microsoft-cp1252</literal>', and -`<literal remap="tt">microsoft-win3.1</literal>'. (The encoding `<literal remap="tt">microsoft-symbol</literal>' doesn't +which case you should experiment with <quote><literal remap="tt">adobe-standard</literal></quote>, +<quote><literal remap="tt">iso8859-1</literal></quote>, <quote><literal remap="tt">microsoft-cp1252</literal></quote>, and +<quote><literal remap="tt">microsoft-win3.1</literal></quote>. (The encoding <quote><literal remap="tt">microsoft-symbol</literal></quote> doesn't make sense for Type 1 fonts). </para> <para> TrueType fonts do not have a default encoding. However, most TrueType fonts are designed with either Microsoft or Apple platforms in mind, -so one of `<literal remap="tt">microsoft-symbol</literal>', `<literal remap="tt">microsoft-cp1252</literal>', -`<literal remap="tt">microsoft-win3.1</literal>', or `<literal remap="tt">apple-roman</literal>' should yield reasonable +so one of <quote><literal remap="tt">microsoft-symbol</literal></quote>, <quote><literal remap="tt">microsoft-cp1252</literal></quote>, +<quote><literal remap="tt">microsoft-win3.1</literal></quote>, or <quote><literal remap="tt">apple-roman</literal></quote> should yield reasonable results. </para> </sect4> -<sect4> +<sect4 id='Specifying_an_ad_hoc_encoding_file'> <title>Specifying an <emphasis remap="it">ad hoc</emphasis> encoding file</title> <para> It is always possible to define an encoding file to put the glyphs in a font in any desired order. Again, see the -`<filename>encodings/adobe-dingbats.enc</filename>' file to see how this is done. +<quote><filename>encodings/adobe-dingbats.enc</filename></quote> file to see how this is done. </para> </sect4> -<sect4> +<sect4 id='Specifying_font_aliases'> <title>Specifying font aliases</title> <para> By following the directions above, you will find yourself with a number of fonts with unusual names --- with encodings such as -`<literal remap="tt">adobe-fontspecific</literal>', `<literal remap="tt">microsoft-win3.1</literal>' <emphasis remap="it">etc</emphasis>. In order +<quote><literal remap="tt">adobe-fontspecific</literal></quote>, <quote><literal remap="tt">microsoft-win3.1</literal></quote> <emphasis remap="it">etc</emphasis>. In order to use these fonts with standard applications, it may be useful to remap them to their proper names. </para> <para> -This is done by writing a `<filename>fonts.alias</filename>' file. The format of this file +This is done by writing a <quote><filename>fonts.alias</filename></quote> file. The format of this file is very simple: it consists of a series of lines each mapping an alias -name to a font name. A `<filename>fonts.alias</filename>' file might look as follows: +name to a font name. A <quote><filename>fonts.alias</filename></quote> file might look as follows: <screen> "-ogonki-alamakota-medium-r-normal--0-0-0-0-p-0-iso8859-2" \ @@ -1490,7 +1493,7 @@ name to a font name. A `<filename>fonts.alias</filename>' file might look as fo </screen> (both XLFD names on a single line). The syntax of the -`<filename>fonts.alias</filename>' file is more precisely described in the +<quote><filename>fonts.alias</filename></quote> file is more precisely described in the <ulink url="mkfontdir.1.html" >mkfontdir(1)</ulink @@ -1503,11 +1506,11 @@ url="mkfontdir.1.html" </sect2> -<sect2> +<sect2 id='Additional_notes_about_scalable_core_fonts'> <title>Additional notes about scalable core fonts</title> -<sect3> +<sect3 id='About_the_FreeType_backend'> <title>About the <emphasis remap="it">FreeType</emphasis> backend</title> <para> @@ -1521,10 +1524,11 @@ Project (see <ulink url="http://x-tt.sourceforge.jp/" >the After X-TT Project web site</ulink >). The <emphasis remap="it">FreeType</emphasis> backend has support for the -``fontenc'' style of internationalisation (see <xref linkend="sec-fontenc"/>). This backend supports TrueType font files -(`<filename>*.ttf</filename>'), OpenType font files (`<filename>*.otf</filename>'), TrueType Collections -(`<filename>*.ttc</filename>'), OpenType Collections (`<filename>*.otc</filename>') and Type 1 font -files (`<filename>*.pfa</filename>' and `<filename>*.pfb</filename>'). +<quote>fontenc</quote> style of internationalisation (see +<xref linkend='The_fontenc_layer' xrefstyle='select: title'/>). This backend supports TrueType font files +(<quote><filename>*.ttf</filename></quote>), OpenType font files (<quote><filename>*.otf</filename></quote>), TrueType Collections +(<quote><filename>*.ttc</filename></quote>), OpenType Collections (<quote><filename>*.otc</filename></quote>) and Type 1 font +files (<quote><filename>*.pfa</filename></quote> and <quote><filename>*.pfb</filename></quote>). </para> <para> @@ -1542,13 +1546,13 @@ within a pair of colons, or by setting the 'fn' TTCap option. For example, </para> <para> -refers to face 1 in the `<filename>mincho.ttc</filename>' TrueType Collection file. +refers to face 1 in the <quote><filename>mincho.ttc</filename></quote> TrueType Collection file. </para> <para> The new <emphasis remap="it">FreeType</emphasis> backend supports the extended -`<filename>fonts.dir</filename>' syntax introduced by X-TrueType with a number -of options, collectively known as `TTCap'. A `TTCap' entry follows the +<quote><filename>fonts.dir</filename></quote> syntax introduced by X-TrueType with a number +of options, collectively known as <quote>TTCap</quote>. A <quote>TTCap</quote> entry follows the general syntax </para> @@ -1563,8 +1567,8 @@ option=value: <para> and should be specified before the filename. The new <emphasis remap="it">FreeType</emphasis> almost perfectly supports TTCap options that are compatible with X-TT -1.4. The Automatic Italic (`<literal remap="tt">ai</literal>'), Double Strike (`<literal remap="tt">ds</literal>') and -Bounding box Width (`<literal remap="tt">bw</literal>') options are indispensable in CJKV. +1.4. The Automatic Italic (<quote><literal remap="tt">ai</literal></quote>), Double Strike (<quote><literal remap="tt">ds</literal></quote>) and +Bounding box Width (<quote><literal remap="tt">bw</literal></quote>) options are indispensable in CJKV. For example, </para> @@ -1593,37 +1597,38 @@ url="http://x-tt.sourceforge.jp/" <para> The <emphasis remap="it">FreeType</emphasis> backend uses the <emphasis remap="it">fontenc</emphasis> layer in order to support -recoding of fonts; this was described in <xref linkend="sec-fontenc"/> and especially <xref linkend="sec-fontenc-freetype"/> earlier in this document. +recoding of fonts; this was described in <xref linkend='The_fontenc_layer' xrefstyle='select: title'/> +and especially <xref linkend='The_FreeType_backend' xrefstyle='select: title'/> earlier in this document. </para> </sect3> -<sect3> +<sect3 id='Delayed_glyph_rasterisation'> <title>Delayed glyph rasterisation</title> <para> When loading a proportional fonts which contain a huge number of glyphs, the old <emphasis remap="it">FreeType</emphasis> delayed glyph rasterisation until the time at which the glyph was first used. The new FreeType (libfreetype-xtt2) has an -improved `very lazy' metric calculation method to speed up the process when +improved <quote>very lazy</quote> metric calculation method to speed up the process when loading TrueType or OpenType fonts. Although the <emphasis remap="it">X-TT</emphasis> module also has this method, the "<literal remap="tt">vl=y</literal>" TTCap option must be set if you want to use it. This is the default method for <emphasis remap="it">FreeType</emphasis> when it loads multi-byte fonts. Even if you use a unicode font which has tens of thousands of glyphs, this delay will not be worrisome as long as you use -the new <emphasis remap="it">FreeType</emphasis> backend -- its `very lazy' method is super-fast. +the new <emphasis remap="it">FreeType</emphasis> backend -- its <quote>very lazy</quote> method is super-fast. </para> <para> -The maximum error of bitmap position using `very lazy' method is 1 pixel, +The maximum error of bitmap position using <quote>very lazy</quote> method is 1 pixel, and is the same as that of a character-cell spacing. When the X-TT -backend is used with the `<literal remap="tt">vl=y</literal>' option, a chipped bitmap is displayed +backend is used with the <quote><literal remap="tt">vl=y</literal></quote> option, a chipped bitmap is displayed with certain fonts. However, the new FreeType backend has minimal problem with this, since it corrects left- and right-side bearings using -`italicAngle' in the TrueType/OpenType post table, and does automatic +<quote>italicAngle</quote> in the TrueType/OpenType post table, and does automatic correction of bitmap positions when rasterisation so that chipped bitmaps -are not displayed. Nevertheless if you don't want to use the `very lazy' -method when using multi-bytes fonts, set `<literal remap="tt">vl=n</literal>' in the TTCap option to +are not displayed. Nevertheless if you don't want to use the <quote>very lazy</quote> +method when using multi-bytes fonts, set <quote><literal remap="tt">vl=n</literal></quote> in the TTCap option to disable it: </para> @@ -1638,7 +1643,7 @@ vl=n:luxirr.ttf -b&h-Luxi Serif-medium-r-normal--0-0-0-0-p-0-iso10646-1 <para> Of course, both backends also support an optimisation for character-cell fonts (fonts with all glyph metrics equal, or terminal fonts). A font -with an XLFD specifying a character-cell spacing `<literal remap="tt">c</literal>', as in +with an XLFD specifying a character-cell spacing <quote><literal remap="tt">c</literal></quote>, as in </para> <para> @@ -1674,10 +1679,10 @@ that not all monospaced fonts are character-cell fonts. </sect1> -<sect1 id="sec-background" xreflabel="Appendix: Background"> -<title>Appendix: background and terminology </title> +<sect1 id='Appendix_background_and_terminology'> +<title>Appendix: background and terminology</title> -<sect2> +<sect2 id='Characters_and_glyphs'> <title>Characters and glyphs</title> <para> @@ -1716,8 +1721,8 @@ character sets are necessary for ideographic writing systems. </sect2> -<sect2 id="sec-xlfd"> -<title>Font files, fonts, and XLFD </title> +<sect2 id='Font_files_fonts_and_XLFD'> +<title>Font files, fonts, and XLFD</title> <para> Traditionally, typographers speak about <emphasis remap="it">typefaces</emphasis> and @@ -1759,14 +1764,14 @@ indexed according to a given encoding. <para> X11 core font instances are usually specified using a notation known as the <emphasis remap="it">X Logical Font Description</emphasis> (XLFD). An XLFD starts with a -dash `<literal remap="tt">-</literal>', and consists of fourteen fields separated by dashes, +dash <quote><literal remap="tt">-</literal></quote>, and consists of fourteen fields separated by dashes, for example: <screen> -adobe-courier-medium-r-normal--12-120-75-75-m-70-iso8859-1 </screen> -Or particular interest are the last two fields `<literal remap="tt">iso8859-1</literal>', which +Or particular interest are the last two fields <quote><literal remap="tt">iso8859-1</literal></quote>, which specify the font instance's encoding. </para> @@ -1785,14 +1790,14 @@ X11 font instances may also be specified by short name. Unlike an XLFD, a short name has no structure and is simply a conventional name for a font instance. Two short names are of particular interest, as the server will not start if font instances with these names cannot be -opened. These are `<literal remap="tt">fixed</literal>', which specifies the fallback font to -use when the requested font cannot be opened, and `<literal remap="tt">cursor</literal>', which +opened. These are <quote><literal remap="tt">fixed</literal></quote>, which specifies the fallback font to +use when the requested font cannot be opened, and <quote><literal remap="tt">cursor</literal></quote>, which specifies the set of glyphs to be used by the mouse pointer. </para> <para> Short names are usually implemented as aliases to XLFDs; the -standard `<literal remap="tt">fixed</literal>' and `<literal remap="tt">cursor</literal>' aliases are defined in +standard <quote><literal remap="tt">fixed</literal></quote> and <quote><literal remap="tt">cursor</literal></quote> aliases are defined in <screen> /usr/share/font/X11/misc/fonts.alias @@ -1802,7 +1807,7 @@ standard `<literal remap="tt">fixed</literal>' and `<literal remap="tt">cursor</ </sect2> -<sect2> +<sect2 id='Unicode'> <title>Unicode</title> <para> @@ -1833,14 +1838,14 @@ equivalent, and we often use the terms <emphasis remap="it">Unicode</emphasis> a <para> When used in the X11 core fonts system, Unicode-encoded fonts should -have the last two fields of their XLFD set to `<literal remap="tt">iso10646-1</literal>'. +have the last two fields of their XLFD set to <quote><literal remap="tt">iso10646-1</literal></quote>. </para> </sect2> </sect1> -<sect1> +<sect1 id='References'> <title>References</title> <para> @@ -1873,9 +1878,8 @@ url="xlsfonts.1.html" > and <ulink url="showfont.1.html" >showfont(1)</ulink ->. In addition, you may want to read the X Logical -Font Description document, by Jim Flowers, which is provided in the file -`<filename>xc/doc/xlfd.PS.Z</filename>'. +>. In addition, you may want to read the <olink targetdoc='xlfd' +targetptr='xlfd'>X Logical Font Description document</olink> by Jim Flowers. </para> <para> @@ -1891,7 +1895,7 @@ of information about digital fonts. Xft and Fontconfig are described on <ulink url="http://www.fontconfig.org" ->Keith Packard's Fontconfig site</ulink +>the Fontconfig site</ulink >. </para> @@ -1907,7 +1911,7 @@ however still find some of the information that it contains useful. url="http://www.joerg-pommnitz.de/TrueType/xfsft.html" >Joerg Pommnitz' xfsft page</ulink > -is the canonical source for the `<command>ttmkfdir</command>' utility, which is the +is the canonical source for the <quote><command>ttmkfdir</command></quote> utility, which is the ancestor of <command>mkfontscale</command>. </para> @@ -1940,9 +1944,10 @@ url="http://www.cl.cam.ac.uk/~mgk25/unicode.html" </para> <para> -The IANA RFC documents, available from a number of sites throughout +The IETF RFC documents, available from a number of sites throughout the world, often provide interesting information about character set -issues; see for example RFC 373. +issues; see for example <ulink +url="https://datatracker.ietf.org/doc/rfc373/">RFC 373</ulink>. </para> </sect1> diff --git a/doc/xorg-docs/general/graphics/Makefile.am b/doc/xorg-docs/general/graphics/Makefile.am index 542f12c72..f90450db3 100644 --- a/doc/xorg-docs/general/graphics/Makefile.am +++ b/doc/xorg-docs/general/graphics/Makefile.am @@ -1,10 +1,13 @@ + if ENABLE_DOCS -doc_sources = dps.xml +# Main DocBook/XML files (DOCTYPE book) +docbook = dps.xml -xmldir = $(docdir)/graphics -dist_xml_DATA = $(doc_sources) +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir)/graphics -include $(top_srcdir)/xmlrules.in +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am endif ENABLE_DOCS diff --git a/doc/xorg-docs/general/graphics/Makefile.in b/doc/xorg-docs/general/graphics/Makefile.in index 2e4bffa7d..d4020c845 100644 --- a/doc/xorg-docs/general/graphics/Makefile.in +++ b/doc/xorg-docs/general/graphics/Makefile.in @@ -15,26 +15,19 @@ @SET_MAKE@ # -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Generate output formats for a single DocBook/XML with/without chapters # -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: +# Variables set by the calling Makefile: +# shelfdir: the location where the docs/specs are installed. Typically $(docdir) +# docbook: the main DocBook/XML file, no chapters, appendix or image files +# chapters: all files pulled in by an XInclude statement and images. # -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. + # -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. +# This makefile is intended for Users Documentation and Functional Specifications. +# Do not use for Developer Documentation which is not installed and does not require olink. +# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 +# for an explanation on documents classification. # srcdir = @srcdir@ @@ -46,9 +39,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +install_sh_DATA = ${SHELL} $(install_sh) -c -m 644 +install_sh_PROGRAM = ${SHELL} $(install_sh) -c +install_sh_SCRIPT = ${SHELL} $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) transform = $(program_transform_name) NORMAL_INSTALL = : @@ -59,10 +52,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(am__dist_xml_DATA_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/xmlrules.in -@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(doc_sources:.xml=.txt) +DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/docbook.am +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) subdir = general/graphics ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -72,17 +69,17 @@ mkinstalldirs = $(SHELL) $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__dist_xml_DATA_DIST = dps.xml +am__dist_shelf_DATA_DIST = dps.xml am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)" -dist_xmlDATA_INSTALL = $(INSTALL_DATA) -xmlDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_xml_DATA) $(xml_DATA) +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" +dist_shelfDATA_INSTALL = $(INSTALL_DATA) +shelfDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_shelf_DATA) $(shelf_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ @@ -97,6 +94,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -130,6 +128,8 @@ HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@ HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@ HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@ HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@ +HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@ +HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@ INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -160,12 +160,14 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -210,26 +212,73 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@ENABLE_DOCS_TRUE@doc_sources = dps.xml -@ENABLE_DOCS_TRUE@xmldir = $(docdir)/graphics -@ENABLE_DOCS_TRUE@dist_xml_DATA = $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@xml_DATA = \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(doc_sources:.xml=.html) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_1) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_2) -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -m $(XSL_STYLESHEET) \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath $(XORG_SGML_PATH)/X11 \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam img.src.path=$(abs_builddir)/ - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@SUFFIXES = .xml .ps .pdf .txt .html + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_DOCS_TRUE@docbook = dps.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_DOCS_TRUE@shelfdir = $(docdir)/graphics + +# DocBook/XML generated output formats to be installed +@ENABLE_DOCS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_DOCS_TRUE@ $(am__append_3) $(am__append_4) + +# DocBook/XML file with chapters, appendix and images it includes +@ENABLE_DOCS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) + + +# Generate documents cross-reference target databases +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +@ENABLE_DOCS_TRUE@CLEANFILES = $(shelf_DATA) all: all-am .SUFFIXES: -.SUFFIXES: .xml .ps .pdf .txt .html -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/xmlrules.in $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -259,39 +308,39 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-dist_xmlDATA: $(dist_xml_DATA) +install-dist_shelfDATA: $(dist_shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(dist_xml_DATA)'; for p in $$list; do \ + test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)" + @list='$(dist_shelf_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(dist_xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(dist_xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-dist_xmlDATA: +uninstall-dist_shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_xml_DATA)'; for p in $$list; do \ + @list='$(dist_shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-xmlDATA: $(xml_DATA) +install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(xml_DATA)'; for p in $$list; do \ + test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)" + @list='$(shelf_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-xmlDATA: +uninstall-shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(xml_DATA)'; for p in $$list; do \ + @list='$(shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done tags: TAGS TAGS: @@ -332,7 +381,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -360,11 +409,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_DOCS_FALSE@clean-local: -@HAVE_XMLTO_FALSE@clean-local: clean: clean-am -clean-am: clean-generic clean-local mostlyclean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -380,7 +427,7 @@ info: info-am info-am: -install-data-am: install-dist_xmlDATA install-xmlDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -406,37 +453,33 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_xmlDATA uninstall-info-am \ - uninstall-xmlDATA - -.PHONY: all all-am check check-am clean clean-generic clean-local \ - distclean distclean-generic distdir dvi dvi-am html html-am \ - info info-am install install-am install-data install-data-am \ - install-dist_xmlDATA install-exec install-exec-am install-info \ - install-info-am install-man install-strip install-xmlDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-dist_xmlDATA \ - uninstall-info-am uninstall-xmlDATA - - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@clean-local: -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)rm -fr html/ +uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ + uninstall-shelfDATA + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-exec install-exec-am \ + install-info install-info-am install-man install-shelfDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< + +# Generate DocBook/XML output formats with or without stylesheets # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/xorg-docs/general/graphics/dps.xml b/doc/xorg-docs/general/graphics/dps.xml index ebb30f72b..89a542a7b 100644 --- a/doc/xorg-docs/general/graphics/dps.xml +++ b/doc/xorg-docs/general/graphics/dps.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ ]> -<article> +<article id='dps'> <articleinfo> @@ -28,7 +28,7 @@ Updated by Jim Gettys and Juliusz Chroboczek. </para> -<sect1> +<sect1 id='Notice_of_Obsolescence_and_Removal_from_X.Org_Releases'> <title>Notice of Obsolescence and Removal from X.Org Releases</title> <para> diff --git a/doc/xorg-docs/general/input/Makefile.am b/doc/xorg-docs/general/input/Makefile.am index 292ed2c25..56533670b 100644 --- a/doc/xorg-docs/general/input/Makefile.am +++ b/doc/xorg-docs/general/input/Makefile.am @@ -1,10 +1,13 @@ + if ENABLE_DOCS -doc_sources = XKB-Config.xml XKB-Enhancing.xml +# Main DocBook/XML files (DOCTYPE book) +docbook = XKB-Config.xml XKB-Enhancing.xml -xmldir = $(docdir)/input -dist_xml_DATA = $(doc_sources) +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir)/input -include $(top_srcdir)/xmlrules.in +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am endif ENABLE_DOCS diff --git a/doc/xorg-docs/general/input/Makefile.in b/doc/xorg-docs/general/input/Makefile.in index 64263262f..24a410f3e 100644 --- a/doc/xorg-docs/general/input/Makefile.in +++ b/doc/xorg-docs/general/input/Makefile.in @@ -15,26 +15,19 @@ @SET_MAKE@ # -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Generate output formats for a single DocBook/XML with/without chapters # -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: +# Variables set by the calling Makefile: +# shelfdir: the location where the docs/specs are installed. Typically $(docdir) +# docbook: the main DocBook/XML file, no chapters, appendix or image files +# chapters: all files pulled in by an XInclude statement and images. # -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. + # -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. +# This makefile is intended for Users Documentation and Functional Specifications. +# Do not use for Developer Documentation which is not installed and does not require olink. +# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 +# for an explanation on documents classification. # srcdir = @srcdir@ @@ -46,9 +39,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +install_sh_DATA = ${SHELL} $(install_sh) -c -m 644 +install_sh_PROGRAM = ${SHELL} $(install_sh) -c +install_sh_SCRIPT = ${SHELL} $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) transform = $(program_transform_name) NORMAL_INSTALL = : @@ -59,10 +52,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(am__dist_xml_DATA_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/xmlrules.in -@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(doc_sources:.xml=.txt) +DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/docbook.am +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) subdir = general/input ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -72,17 +69,17 @@ mkinstalldirs = $(SHELL) $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__dist_xml_DATA_DIST = XKB-Config.xml XKB-Enhancing.xml +am__dist_shelf_DATA_DIST = XKB-Config.xml XKB-Enhancing.xml am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)" -dist_xmlDATA_INSTALL = $(INSTALL_DATA) -xmlDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_xml_DATA) $(xml_DATA) +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" +dist_shelfDATA_INSTALL = $(INSTALL_DATA) +shelfDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_shelf_DATA) $(shelf_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ @@ -97,6 +94,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -130,6 +128,8 @@ HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@ HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@ HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@ HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@ +HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@ +HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@ INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -160,12 +160,14 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -210,26 +212,73 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@ENABLE_DOCS_TRUE@doc_sources = XKB-Config.xml XKB-Enhancing.xml -@ENABLE_DOCS_TRUE@xmldir = $(docdir)/input -@ENABLE_DOCS_TRUE@dist_xml_DATA = $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@xml_DATA = \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(doc_sources:.xml=.html) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_1) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_2) -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -m $(XSL_STYLESHEET) \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath $(XORG_SGML_PATH)/X11 \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam img.src.path=$(abs_builddir)/ - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@SUFFIXES = .xml .ps .pdf .txt .html + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_DOCS_TRUE@docbook = XKB-Config.xml XKB-Enhancing.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_DOCS_TRUE@shelfdir = $(docdir)/input + +# DocBook/XML generated output formats to be installed +@ENABLE_DOCS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_DOCS_TRUE@ $(am__append_3) $(am__append_4) + +# DocBook/XML file with chapters, appendix and images it includes +@ENABLE_DOCS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) + + +# Generate documents cross-reference target databases +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +@ENABLE_DOCS_TRUE@CLEANFILES = $(shelf_DATA) all: all-am .SUFFIXES: -.SUFFIXES: .xml .ps .pdf .txt .html -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/xmlrules.in $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -259,39 +308,39 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-dist_xmlDATA: $(dist_xml_DATA) +install-dist_shelfDATA: $(dist_shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(dist_xml_DATA)'; for p in $$list; do \ + test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)" + @list='$(dist_shelf_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(dist_xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(dist_xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-dist_xmlDATA: +uninstall-dist_shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_xml_DATA)'; for p in $$list; do \ + @list='$(dist_shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-xmlDATA: $(xml_DATA) +install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(xml_DATA)'; for p in $$list; do \ + test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)" + @list='$(shelf_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-xmlDATA: +uninstall-shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(xml_DATA)'; for p in $$list; do \ + @list='$(shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done tags: TAGS TAGS: @@ -332,7 +381,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -360,11 +409,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_DOCS_FALSE@clean-local: -@HAVE_XMLTO_FALSE@clean-local: clean: clean-am -clean-am: clean-generic clean-local mostlyclean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -380,7 +427,7 @@ info: info-am info-am: -install-data-am: install-dist_xmlDATA install-xmlDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -406,37 +453,33 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_xmlDATA uninstall-info-am \ - uninstall-xmlDATA - -.PHONY: all all-am check check-am clean clean-generic clean-local \ - distclean distclean-generic distdir dvi dvi-am html html-am \ - info info-am install install-am install-data install-data-am \ - install-dist_xmlDATA install-exec install-exec-am install-info \ - install-info-am install-man install-strip install-xmlDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-dist_xmlDATA \ - uninstall-info-am uninstall-xmlDATA - - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@clean-local: -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)rm -fr html/ +uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ + uninstall-shelfDATA + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-exec install-exec-am \ + install-info install-info-am install-man install-shelfDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< + +# Generate DocBook/XML output formats with or without stylesheets # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/xorg-docs/general/input/XKB-Config.xml b/doc/xorg-docs/general/input/XKB-Config.xml index fab061c09..b544745af 100644 --- a/doc/xorg-docs/general/input/XKB-Config.xml +++ b/doc/xorg-docs/general/input/XKB-Config.xml @@ -1,13 +1,16 @@ <?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; ]> -<article> +<article id='XKB-Config'> <articleinfo> <title>The XKB Configuration Guide</title> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> <authorgroup> <author> <firstname>Kamil</firstname><surname>Toman</surname> @@ -36,7 +39,7 @@ url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig" </articleinfo> - <sect1> + <sect1 id='Overview'> <title>Overview</title> <para> @@ -57,7 +60,7 @@ than those tools provide. </sect1> - <sect1> + <sect1 id='Selecting_XKB_Configuration'> <title>Selecting XKB Configuration</title> <para> @@ -132,7 +135,7 @@ the xkb configuration subdirectory <filename>rules</filename> (for example <filename>/usr/share/X11/xkb/rules</filename>). </para> - <sect2> + <sect2 id='Basic_Configuration'> <title>Basic Configuration</title> <para> @@ -199,7 +202,7 @@ setxkbmap -option "terminate:ctrl_alt_bksp" </sect2> - <sect2> + <sect2 id='Advanced_Configuration'> <title>Advanced Configuration</title> <para> @@ -245,7 +248,7 @@ setxkbmap -model logicordless -layout "us,cz,de" \ </sect2> - <sect2> + <sect2 id='Even_More_Advanced_Configuration'> <title>Even More Advanced Configuration</title> <para> @@ -285,7 +288,7 @@ setxkbmap -model logicordless -layout "us,cz,de" \ </sect2> - <sect2> + <sect2 id='Basic_Global_Options'> <title>Basic Global Options</title> <para> @@ -302,7 +305,7 @@ see the section starting with <quote><literal>! option</literal></quote> in the </sect1> - <sect1> + <sect1 id='Keymap_XKB_Configuration'> <title>Keymap XKB Configuration</title> <para> diff --git a/doc/xorg-docs/general/input/XKB-Enhancing.xml b/doc/xorg-docs/general/input/XKB-Enhancing.xml index 060165198..dca12a597 100644 --- a/doc/xorg-docs/general/input/XKB-Enhancing.xml +++ b/doc/xorg-docs/general/input/XKB-Enhancing.xml @@ -1,13 +1,16 @@ <?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" -[]> +[ +<!ENTITY % defs SYSTEM "defs.ent"> %defs; +]> -<article> +<article id='XKB-Enhancing'> <articleinfo> <title>How to further enhance XKB configuration</title> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> <authorgroup> <author> <firstname>Kamil</firstname><surname>Toman</surname> @@ -29,7 +32,7 @@ keyboard layout. Unlike other documents this guide accents the keymap developer' </articleinfo> - <sect1> + <sect1 id='Overview'> <title>Overview</title> <para> @@ -59,7 +62,7 @@ are to be made to XFree86 version 4.3 and X11R6.7.0 and above. </sect1> - <sect1> + <sect1 id='The_Basics'> <title>The Basics</title> <para> @@ -165,7 +168,7 @@ in subdirectories with the same names (usually in </sect1> - <sect1> + <sect1 id='Enhancing_XKB_Configuration'> <title>Enhancing XKB Configuration</title> <para> @@ -205,7 +208,7 @@ Even if there is nothing similar you may get some ideas about basic concepts and used tricks. </para> - <sect2> + <sect2 id='Levels_And_Groups'> <title>Levels And Groups</title> <para> @@ -237,7 +240,7 @@ modifiers so it its row has only one column defined. <para> Note that in XKB there is no prior assumption that certain modifiers are bound -to certain columns. By editing proper files (see <xref linkend="keytypes" />) +to certain columns. By editing proper files (see <xref linkend='Key_Types' xrefstyle='select: title'/>) this mapping can be changed as well. </para> @@ -321,7 +324,7 @@ behaviour </sect1> - <sect1> + <sect1 id='Defining_New_Layouts'> <title>Defining New Layouts</title> <!-- @@ -342,7 +345,7 @@ See <ulink url="http://www.tsu.ru/~pascal/en/xkb/gram-common.html" syntax of xkb configuration files. </para> - <sect2> + <sect2 id='Predefined_XKB_Symbol_Sets'> <title>Predefined XKB Symbol Sets</title> <para> @@ -416,8 +419,8 @@ definition and altering what may be needed. </sect2> - <sect2 id="keytypes" xreflabel="keytypes"> - <title>Key Types</title> + <sect2 id='Key_Types'> +<title>Key Types</title> <para> The differences in the number of columns (shift levels) are caused by @@ -610,7 +613,7 @@ Don't alter any of existing key types. If you need a different behaviour create a new one. </para> - <sect3> + <sect3 id='More_On_Definitions_Of_Types'> <title>More On Definitions Of Types</title> <para> @@ -699,7 +702,7 @@ type definitions. </sect2> - <sect2> + <sect2 id='Rules'> <title>Rules</title> <para> @@ -811,7 +814,7 @@ symbols in appropriate variants as a default. TODO: better and more complex explanation of rules --> - <sect2> + <sect2 id='Descriptive_Files_of_Rules'> <title>Descriptive Files of Rules</title> <para> @@ -825,7 +828,7 @@ this file) know what is your work about. TODO: format and semantics --> - <sect3> + <sect3 id='Old_Descriptive_Files'> <title>Old Descriptive Files</title> <para> diff --git a/doc/xorg-docs/general/platforms/Darwin.xml b/doc/xorg-docs/general/platforms/Darwin.xml index 552eee014..38e6801cb 100644 --- a/doc/xorg-docs/general/platforms/Darwin.xml +++ b/doc/xorg-docs/general/platforms/Darwin.xml @@ -2,19 +2,20 @@ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ -<!ENTITY % defs SYSTEM "/xorg-sgml-doctools/X11/defs.ent"> %defs; +<!ENTITY % defs SYSTEM "defs.ent"> %defs; ]> -<article> +<article id='Darwin'> <articleinfo> - <title>X.Org X11R&relvers; on Darwin and Mac OS X</title> - <pubdate>October 2009</pubdate> + <title>X on Darwin and Mac OS X</title> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> + <pubdate>October 2009</pubdate> </articleinfo> - <sect1> + <sect1 id='Introduction'> <title>Introduction</title> <para> diff --git a/doc/xorg-docs/general/platforms/Makefile.am b/doc/xorg-docs/general/platforms/Makefile.am index 65dbf2ab9..858e26dca 100644 --- a/doc/xorg-docs/general/platforms/Makefile.am +++ b/doc/xorg-docs/general/platforms/Makefile.am @@ -1,12 +1,13 @@ + if ENABLE_DOCS -doc_sources = \ - Darwin.xml \ - Solaris.xml +# Main DocBook/XML files (DOCTYPE book) +docbook = Darwin.xml Solaris.xml -xmldir = $(docdir)/platforms -dist_xml_DATA = $(doc_sources) +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir)/platforms -include $(top_srcdir)/xmlrules.in +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am endif ENABLE_DOCS diff --git a/doc/xorg-docs/general/platforms/Makefile.in b/doc/xorg-docs/general/platforms/Makefile.in index 44d7f939e..5d138bdd1 100644 --- a/doc/xorg-docs/general/platforms/Makefile.in +++ b/doc/xorg-docs/general/platforms/Makefile.in @@ -15,26 +15,19 @@ @SET_MAKE@ # -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Generate output formats for a single DocBook/XML with/without chapters # -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: +# Variables set by the calling Makefile: +# shelfdir: the location where the docs/specs are installed. Typically $(docdir) +# docbook: the main DocBook/XML file, no chapters, appendix or image files +# chapters: all files pulled in by an XInclude statement and images. # -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. + # -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. +# This makefile is intended for Users Documentation and Functional Specifications. +# Do not use for Developer Documentation which is not installed and does not require olink. +# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 +# for an explanation on documents classification. # srcdir = @srcdir@ @@ -46,9 +39,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +install_sh_DATA = ${SHELL} $(install_sh) -c -m 644 +install_sh_PROGRAM = ${SHELL} $(install_sh) -c +install_sh_SCRIPT = ${SHELL} $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) transform = $(program_transform_name) NORMAL_INSTALL = : @@ -59,10 +52,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(am__dist_xml_DATA_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/xmlrules.in -@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(doc_sources:.xml=.txt) +DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/docbook.am +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db) subdir = general/platforms ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -72,17 +69,17 @@ mkinstalldirs = $(SHELL) $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__dist_xml_DATA_DIST = Darwin.xml Solaris.xml +am__dist_shelf_DATA_DIST = Darwin.xml Solaris.xml am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)" -dist_xmlDATA_INSTALL = $(INSTALL_DATA) -xmlDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_xml_DATA) $(xml_DATA) +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" +dist_shelfDATA_INSTALL = $(INSTALL_DATA) +shelfDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_shelf_DATA) $(shelf_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ @@ -97,6 +94,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -130,6 +128,8 @@ HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@ HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@ HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@ HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@ +HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@ +HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@ INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -160,12 +160,14 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ XMLTO = @XMLTO@ XORG_MAN_PAGE = @XORG_MAN_PAGE@ XORG_SGML_PATH = @XORG_SGML_PATH@ +XSLTPROC = @XSLTPROC@ XSL_STYLESHEET = @XSL_STYLESHEET@ ac_ct_CC = @ac_ct_CC@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ @@ -210,29 +212,73 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@ENABLE_DOCS_TRUE@doc_sources = \ -@ENABLE_DOCS_TRUE@ Darwin.xml \ -@ENABLE_DOCS_TRUE@ Solaris.xml - -@ENABLE_DOCS_TRUE@xmldir = $(docdir)/platforms -@ENABLE_DOCS_TRUE@dist_xml_DATA = $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@xml_DATA = \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(doc_sources:.xml=.html) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_1) \ -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_2) -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -m $(XSL_STYLESHEET) \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath $(XORG_SGML_PATH)/X11 \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css \ -@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam img.src.path=$(abs_builddir)/ - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@SUFFIXES = .xml .ps .pdf .txt .html + +# Main DocBook/XML files (DOCTYPE book) +@ENABLE_DOCS_TRUE@docbook = Darwin.xml Solaris.xml + +# The location where the DocBook/XML files and their generated formats are installed +@ENABLE_DOCS_TRUE@shelfdir = $(docdir)/platforms + +# DocBook/XML generated output formats to be installed +@ENABLE_DOCS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_DOCS_TRUE@ $(am__append_3) $(am__append_4) + +# DocBook/XML file with chapters, appendix and images it includes +@ENABLE_DOCS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS) + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)" + +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS) + + +# Generate documents cross-reference target databases +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)" + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \ +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +@ENABLE_DOCS_TRUE@CLEANFILES = $(shelf_DATA) all: all-am .SUFFIXES: -.SUFFIXES: .xml .ps .pdf .txt .html -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/xmlrules.in $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -262,39 +308,39 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-dist_xmlDATA: $(dist_xml_DATA) +install-dist_shelfDATA: $(dist_shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(dist_xml_DATA)'; for p in $$list; do \ + test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)" + @list='$(dist_shelf_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(dist_xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(dist_xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-dist_xmlDATA: +uninstall-dist_shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_xml_DATA)'; for p in $$list; do \ + @list='$(dist_shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-xmlDATA: $(xml_DATA) +install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @list='$(xml_DATA)'; for p in $$list; do \ + test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)" + @list='$(shelf_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(xmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmldir)/$$f'"; \ - $(xmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmldir)/$$f"; \ + echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \ + $(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \ done -uninstall-xmlDATA: +uninstall-shelfDATA: @$(NORMAL_UNINSTALL) - @list='$(xml_DATA)'; for p in $$list; do \ + @list='$(shelf_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(xmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(xmldir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done tags: TAGS TAGS: @@ -335,7 +381,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(xmldir)" "$(DESTDIR)$(xmldir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -363,11 +409,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_DOCS_FALSE@clean-local: -@HAVE_XMLTO_FALSE@clean-local: clean: clean-am -clean-am: clean-generic clean-local mostlyclean-am +clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -383,7 +427,7 @@ info: info-am info-am: -install-data-am: install-dist_xmlDATA install-xmlDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -409,37 +453,33 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_xmlDATA uninstall-info-am \ - uninstall-xmlDATA - -.PHONY: all all-am check check-am clean clean-generic clean-local \ - distclean distclean-generic distdir dvi dvi-am html html-am \ - info info-am install install-am install-data install-data-am \ - install-dist_xmlDATA install-exec install-exec-am install-info \ - install-info-am install-man install-strip install-xmlDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-dist_xmlDATA \ - uninstall-info-am uninstall-xmlDATA - - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(dist_xml_DATA) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@chunked-html: $(doc_sources) -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) - -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@clean-local: -@ENABLE_DOCS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)rm -fr html/ +uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ + uninstall-shelfDATA + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_shelfDATA install-exec install-exec-am \ + install-info install-info-am install-man install-shelfDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA + +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters) +@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< + +# Generate DocBook/XML output formats with or without stylesheets # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/xorg-docs/general/platforms/Solaris.xml b/doc/xorg-docs/general/platforms/Solaris.xml index 0a60a3450..dfd2106cd 100644 --- a/doc/xorg-docs/general/platforms/Solaris.xml +++ b/doc/xorg-docs/general/platforms/Solaris.xml @@ -2,17 +2,16 @@ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ -<!ENTITY % defs SYSTEM "/xorg-sgml-doctools/X11/defs.ent"> %defs; +<!ENTITY % defs SYSTEM "defs.ent"> %defs; ]> -<article> +<article id='Solaris'> <!-- Title information --> <articleinfo> - <title>X Window System support for <trademark>Solaris</trademark> & - <trademark>OpenSolaris</trademark> from X.Org - </title> + <title>X Window System on <trademark>Solaris</trademark></title> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> <authorgroup> <author> <firstname>David</firstname><surname>Holland</surname> @@ -28,18 +27,18 @@ <author> <firstname>Alan</firstname><surname>Coopersmith</surname> - <affiliation><orgname><ulink url="http://www.sun.com/">Sun - Microsystems, Inc.</ulink></orgname></affiliation> + <affiliation><orgname><ulink url="http://www.oracle.com/">Oracle + Corp.</ulink></orgname></affiliation> </author> </authorgroup> - <date>2009 September 16</date> + <date>2012 March 20</date> </articleinfo> <!-- Table of contents --> <!-- Begin the document --> -<sect1> +<sect1 id='The_VT-switching_sub-system_in_Solaris'> <title>The VT-switching sub-system in Solaris</title> <para> @@ -53,11 +52,12 @@ If you use this form of virtual terminals, you do so at </para> <para> -A new virtual terminal sub-system has been introduced in Solaris 11 -(currently available in pre-release development builds). This version -is supported on both SPARC and x86 platforms, though SPARC support is -limited to devices with "Coherent Console" support in the kernel frame buffer -driver. Support for it is found only in Xorg 1.7 and later releases. +A new virtual terminal sub-system has been introduced in Solaris 11, +and is also available in systems based on the OpenSolaris or illumos sources. +This version is supported on both SPARC and x86 platforms, though SPARC +support is limited to devices with "Coherent Console" support in the kernel +frame buffer driver. Support for it is found only in Xorg 1.7 and later +server releases. </para> <para> @@ -67,7 +67,7 @@ most other VT sub-systems. </sect1> -<sect1> +<sect1 id='Notes_for_building_X11R&relvers;_on_Solaris'> <title>Notes for building X11R&relvers; on Solaris</title> <para> @@ -119,7 +119,7 @@ these programs must be found before any possible GNU versions. </sect1> -<sect1> +<sect1 id='Notes_for_running_Xorg_on_Solaris'> <title>Notes for running Xorg on Solaris</title> <para> @@ -160,7 +160,7 @@ Xqueue is <emphasis remap="bf">NOT</emphasis> supported under Solaris. </sect1> -<sect1> +<sect1 id='Bug_Notification'> <title>Bug Notification</title> <para> |