diff --git a/proto/fontsproto/ChangeLog b/proto/fontsproto/ChangeLog index 10e7cfa03..4dcb602e5 100644 --- a/proto/fontsproto/ChangeLog +++ b/proto/fontsproto/ChangeLog @@ -1,3 +1,200 @@ +commit 607784e2ad522b7dff32da82480acf6934dc4a23 +Author: Alan Coopersmith +Date: Thu Mar 22 20:40:21 2012 -0700 + + fontsproto 2.1.2 + + Signed-off-by: Alan Coopersmith + +commit 419c6b31ffc3a87caf2861b6eec546cfc661d113 +Author: Matt Dew +Date: Sun Oct 2 20:15:53 2011 -0600 + + 1 - fix the capitolization of the ID attriutes to match either the + or <funcdef> string it goes with. + 2 - fix any <linkend>'s that were affected by 1. + 3 - any <function> in the docs that has an actual funcdef, + will become an olink. + + Signed-off-by: Matt Dew <marcoz@osource.org> + +commit 5073454c1a2510c6e33b7847c8e6f83d38ad03f4 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Tue Sep 20 19:48:46 2011 -0400 + + specs: use <copyright> for the first holder in multi licensing + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 5026754b2310858642a50eeab3b01927b937ab8e +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Mon Sep 19 07:56:51 2011 -0400 + + specs: The strandard name is still "X Consortium Standard" + + This spec, and libX11 spec, are the only two docs with a different + standard name. + + http://cgit.freedesktop.org/xorg/doc/xorg-docs/commit/specs/FSProtocol + ?h=XORG-RELEASE-1&id=0f51a88d2cf4a4d1394c79faa3339e5151e5f682 + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 6817307590e4dec36111bdbb16970d98f8a8889e +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Sep 18 10:28:19 2011 -0400 + + specs: fix multi licensed copyright notice and license text + + For documentation having multiple licenses, the copyright and legalnotice + elements sequence cannot instantiated multiple times. + The copyright notice and license text are therefore coded inside a legalnotice + element. The role attribute on the paragraph is used to allow styling of the + copyright notice text which should not be italicized. + + To view the change in the html format, obtain xorg-sgml-doctools + at version 1.10.1 or later and rebuild the html version of the spec. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit aaf34e37a1a64f9b89c849edc6760c51ad2368d7 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sat Sep 17 20:43:00 2011 -0400 + + specs: fix author affiliation markup + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit ddb83dcf2d4cf3f6f1218240f45983bf086ee001 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Mon Sep 12 20:42:31 2011 -0400 + + docs: use the &fullrelvers; entity to set X11 release information + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit a82382dd66ca300750449f19fcd29f23fe10641d +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Sep 11 19:49:54 2011 -0400 + + docs: remove <productnumber> which is not used by default + + This element is not rendered by default on the title. A template + customization is required to display it. + X Window System does not have a product number. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 1be097307ad7eeb54708467a21295cacb101830b +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Thu Sep 8 20:00:00 2011 -0400 + + docbook.am: embed css styles inside the HTML HEAD element + + Rather than referring to the external xorg.css stylesheet, embed the content + of the file in the html output produced. This is accomplished by using + version 1.10 of xorg-xhtml.xsl. + + This makes the whole html docs tree much more relocatable. + In addition, it eliminates xorg.css as a runtime file which makes + xorg-sgml-doctools a build time only package. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 0192fbcab2810c7b172388d74d19fce35698ae2a +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Sep 7 10:31:04 2011 -0400 + + docbook.am: global maintenance update - entities, images and olinking + + Adding support in libX11 for html chunking caused a reorg of docbook.am + as well as the xorg-sgml-doctools masterdb for olinking. + The parameter img.src.path is added for pdf images. + A searchpath to the root builddir is added for local entities, if present. + + The docbook.am makefile hides all the details and is identical for + all 22 modules having DocBook documentation. It is included by a thin + Makefile.am which requires no docbook knowledge. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit e4372971363bd8a897cfdc62b84704f339645f45 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Jun 12 17:54:50 2011 -0400 + + Install xml versions of specs even if HAVE_XMLTO is false + + DocBook/XML input source is also a usefull output format that can be viewed + with an XML viewer or editor and by some O/S help system. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit c045479c5dad6e50ee711ed18f0f7ed4de84fd88 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Jun 5 16:27:37 2011 -0400 + + Install target dbs alongside generated documents + + This matches a change in xorg-sgml-docs whereby the masterdb will look for + the target dbs into the same location as the generated documents. + + The target dbs are now installed alongside the generated documents. + Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which + has the potential of installing outside the package prefix and cause + distcheck to fail when user does not have write permission in this package. + + Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11 + +commit ea8af5fe7fb284f3dc5fb4df972624d8c190399f +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Feb 27 15:06:18 2011 -0500 + + Documentation: add Docbook external references support + + When writing technical documentation, it is often necessary to cross + reference to other information. When that other information is not in the + current document, additional support is needed, namely <olink>. + + A new feature with version 1.7 of xorg-sgml-doctools adds references to + other documents within or outside this package. + + This patch adds technical support for this feature but does not change + the content of the documentation as seen by the end user. + + Each book or article must generate a database containing the href + of sections that can be referred to from another document. This database + is installed in DATAROOTDIR/sgml/X11/dbs. There is a requirement that + the value of DATAROOTDIR for xorg-sgml-doctools and for the package + documentation is the same. This forms a virtual document tree. + + This database is consulted by other documents while they are being generated + in order to fulfill the missing information for linking. + Refer to the xorg-sgml-doctools for further technical information. + + Co-authored-by: Matt Dew <marcoz@osource.org> + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 74a10bb2f4626072b76dcf54b5ef6c933d63be15 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Thu Dec 16 17:45:23 2010 -0800 + + spec: Fix section titles/nesting + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 043885855c2e8312a75a106cee5460b694299afe +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Tue Nov 9 15:19:09 2010 -0500 + + config: HTML file generation: use the installed copy of xorg.css + + Currenlty the xorg.css file is copied in each location + where a DocBook/XML file resides. This produces about + 70 copies in the $(docdir) install tree. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + commit 2fce721a9a0c0ff820f2cbbf7309990c25852f02 Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Fri Oct 29 21:29:15 2010 -0700 diff --git a/proto/fontsproto/configure.ac b/proto/fontsproto/configure.ac index 1719886b9..ff737f0a8 100644 --- a/proto/fontsproto/configure.ac +++ b/proto/fontsproto/configure.ac @@ -1,18 +1,19 @@ AC_PREREQ([2.60]) -AC_INIT([FontsProto], [2.1.1], +AC_INIT([FontsProto], [2.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in XORG_CHECK_SGML_DOCTOOLS +# Require xorg-macros minimum of 1.12 for DocBook external references m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.10) + [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.12) XORG_DEFAULT_OPTIONS XORG_ENABLE_SPECS -XORG_WITH_XMLTO(0.0.20) +XORG_WITH_XMLTO(0.0.22) XORG_WITH_FOP -XORG_CHECK_SGML_DOCTOOLS(1.5) +XORG_WITH_XSLTPROC +XORG_CHECK_SGML_DOCTOOLS(1.8) AC_OUTPUT([Makefile specs/Makefile diff --git a/proto/fontsproto/docbook.am b/proto/fontsproto/docbook.am new file mode 100644 index 000000000..bba4d5453 --- /dev/null +++ b/proto/fontsproto/docbook.am @@ -0,0 +1,105 @@ +# +# Generate output formats for a single DocBook/XML with/without chapters +# +# 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. +# + +# +# 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. +# + +# DocBook/XML generated output formats to be installed +shelf_DATA = + +# DocBook/XML file with chapters, appendix and images it includes +dist_shelf_DATA = $(docbook) $(chapters) + +if HAVE_XMLTO +if HAVE_STYLESHEETS + +XMLTO_SEARCHPATH_FLAGS = \ + --searchpath "$(XORG_SGML_PATH)/X11" \ + --searchpath "$(abs_top_builddir)" +XMLTO_HTML_OLINK_FLAGS = \ + --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ + --stringparam current.docid="$(<:.xml=)" +XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +XMLTO_HTML_FLAGS = \ + $(XMLTO_SEARCHPATH_FLAGS) \ + $(XMLTO_HTML_STYLESHEET_FLAGS) \ + $(XMLTO_HTML_OLINK_FLAGS) + +shelf_DATA += $(docbook:.xml=.html) +%.html: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< + +if HAVE_XMLTO_TEXT + +shelf_DATA += $(docbook:.xml=.txt) +%.txt: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< +endif HAVE_XMLTO_TEXT + +if HAVE_FOP +XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +XMLTO_PDF_OLINK_FLAGS = \ + --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ + --stringparam current.docid="$(<:.xml=)" +XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +XMLTO_FO_FLAGS = \ + $(XMLTO_SEARCHPATH_FLAGS) \ + $(XMLTO_FO_STYLESHEET_FLAGS) \ + $(XMLTO_FO_IMAGEPATH_FLAGS) \ + $(XMLTO_PDF_OLINK_FLAGS) + +shelf_DATA += $(docbook:.xml=.pdf) +%.pdf: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< + +shelf_DATA += $(docbook:.xml=.ps) +%.ps: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +endif HAVE_FOP + +# Generate documents cross-reference target databases +if HAVE_XSLTPROC + +XSLT_SEARCHPATH_FLAGS = \ + --path "$(XORG_SGML_PATH)/X11" \ + --path "$(abs_top_builddir)" +XSLT_OLINK_FLAGS = \ + --stringparam targets.filename "$@" \ + --stringparam collect.xref.targets "only" \ + --stringparam olink.base.uri "$(@:.db=)" + +XSLT_HTML_FLAGS = \ + $(XSLT_SEARCHPATH_FLAGS) \ + $(XSLT_OLINK_FLAGS) \ + --nonet --xinclude \ + $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +XSLT_PDF_FLAGS = \ + $(XSLT_SEARCHPATH_FLAGS) \ + $(XSLT_OLINK_FLAGS) \ + --nonet --xinclude \ + $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +shelf_DATA += $(docbook:.xml=.html.db) +%.html.db: %.xml $(chapters) + $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< + +shelf_DATA += $(docbook:.xml=.pdf.db) +%.pdf.db: %.xml $(chapters) + $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< + +endif HAVE_XSLTPROC +endif HAVE_STYLESHEETS +endif HAVE_XMLTO + +CLEANFILES = $(shelf_DATA) diff --git a/proto/fontsproto/specs/Makefile.am b/proto/fontsproto/specs/Makefile.am index 516ece015..4035d4b92 100644 --- a/proto/fontsproto/specs/Makefile.am +++ b/proto/fontsproto/specs/Makefile.am @@ -1,64 +1,13 @@ -# -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -# -# 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: -# -# 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. -# if ENABLE_SPECS -doc_sources = fsproto.xml -dist_doc_DATA = $(doc_sources) -if HAVE_XMLTO -doc_DATA = $(doc_sources:.xml=.html) +# Main DocBook/XML files (DOCTYPE book) +docbook = fsproto.xml -if HAVE_FOP -doc_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) -endif +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir) -if HAVE_XMLTO_TEXT -doc_DATA += $(doc_sources:.xml=.txt) -endif +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am -if HAVE_STYLESHEETS -XMLTO_FLAGS = -m $(XSL_STYLESHEET) - -doc_DATA += xorg.css -xorg.css: $(STYLESHEET_SRCDIR)/xorg.css - $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@ -endif - -CLEANFILES = $(doc_DATA) - -SUFFIXES = .xml .ps .pdf .txt .html - -.xml.txt: - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< - -.xml.html: - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $< - -.xml.pdf: - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< - -.xml.ps: - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $< - -endif HAVE_XMLTO endif ENABLE_SPECS diff --git a/proto/fontsproto/specs/fsproto.xml b/proto/fontsproto/specs/fsproto.xml index 95530f1b3..d5a538e92 100644 --- a/proto/fontsproto/specs/fsproto.xml +++ b/proto/fontsproto/specs/fsproto.xml @@ -1,31 +1,28 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" - "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> +<!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; +]> -<book id="fsproto"> +<article id="fsproto"> -<bookinfo> +<articleinfo> <title>The X Font Service Protocol - X Window System Standard + X Consortium Standard + X Version 11, Release &fullrelvers; Version 2.0 JimFulton - -Network Computing Devices, Inc. - + Network Computing Devices, Inc. - X Consortium Standard - 1991Network Computing Devices, Inc. - 1994X Consortium - X Consortium - X Version 11, Release 6.8 Revised May 2, 1994 + 1991Network Computing Devices, Inc. - Permission to use, copy, modify, distribute, and sell this documentation for any purpose is hereby granted without fee, @@ -35,6 +32,10 @@ makes no representations about the suitability for any purpose of the information in this document. This documentation is provided "as is" without express or implied warranty. + + + +Copyright © 1994 X Consortium Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -47,27 +48,23 @@ furnished to do so, subject to the following conditions: The above copyright notice and this permission notice 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 +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 X CONSORTIUM 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. - Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. - + - -TITLE - + Introduction The management of fonts in large, heterogeneous environments is one of the @@ -121,7 +118,7 @@ implement a variety of strategies for fine-grained demand-loading of glyphs. - + Architectural Model @@ -240,7 +237,7 @@ Consortium. - + Font Server Naming @@ -255,7 +252,7 @@ described below. Formats for additional transports may be registered with the X Consortium. - + TCP/IP Names @@ -282,7 +279,7 @@ that may be requested. For example: - + DECnet Names @@ -312,7 +309,7 @@ requested. For example: - + Protocol @@ -380,7 +377,7 @@ A type with a prefix "LISTof" represents a counted list of elements of that type, as in: LISTofCARD8 - + Data Types @@ -1107,7 +1104,7 @@ This structure is padded to 32-bit alignment. - + Requests @@ -2653,7 +2650,7 @@ the client that made the connection. - + Errors @@ -2980,7 +2977,7 @@ Additional errors may be defined by extensions. - + Events @@ -3119,7 +3116,7 @@ Additional events may be defined by extensions. - + Protocol Encoding @@ -3167,7 +3164,7 @@ multiple of four: pad(e) = (4 - (e mod 4)) mod 4 - + Data Types @@ -3366,7 +3363,7 @@ n PROPINFO property data - + Requests open connection @@ -3763,7 +3760,7 @@ p unused, p=pad(m) - + Errors @@ -3897,7 +3894,7 @@ p unused, p=pad(m) - + Events KeepAlive @@ -3931,7 +3928,7 @@ p unused, p=pad(m) - + Acknowledgements @@ -3970,7 +3967,6 @@ the X Consortium. - Suggested Licensing Policies @@ -4081,4 +4077,4 @@ handling of ECONNREFUSED in XConnDis.c). - +