x11proto-fonts: Changes to 'upstream-unstable'
configure.ac | 13 +++---
docbook.am | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
specs/.gitignore | 2 -
specs/Makefile.am | 63 +++-----------------------------
specs/fsproto.xml | 72 +++++++++++++++++--------------------
5 files changed, 153 insertions(+), 102 deletions(-)
New commits:
commit 607784e2ad522b7dff32da82480acf6934dc4a23
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Mar 22 20:40:21 2012 -0700
fontsproto 2.1.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index cc5a760..ff737f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
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
commit 419c6b31ffc3a87caf2861b6eec546cfc661d113
Author: Matt Dew <marcoz@osource.org>
Date: Sun Oct 2 20:15:53 2011 -0600
1 - fix the capitolization of the ID attriutes to match either the
<title> 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>
diff --git a/specs/fsproto.xml b/specs/fsproto.xml
index 9a0c5c8..d5a538e 100644
--- a/specs/fsproto.xml
+++ b/specs/fsproto.xml
@@ -64,7 +64,7 @@ in this Software without prior written authorization from the X Consortium.
</legalnotice>
</articleinfo>
-<sect1 id="introduction">
+<sect1 id='Introduction'>
<title>Introduction</title>
<para>
The management of fonts in large, heterogeneous environments is one of the
@@ -118,7 +118,7 @@ implement a variety of strategies for fine-grained demand-loading of glyphs.
</para>
</sect1>
-<sect1 id="architectural_model">
+<sect1 id='Architectural_Model'>
<title>Architectural Model</title>
<!-- .XS -->
<!-- (SN Architectural Model -->
@@ -237,7 +237,7 @@ Consortium.
</para>
</sect1>
-<sect1 id="font_server_naming">
+<sect1 id='Font_Server_Naming'>
<title>Font Server Naming</title>
<!-- .XS -->
<!-- (SN Font Server Naming -->
@@ -252,7 +252,7 @@ described below. Formats for additional transports may be registered with the
X Consortium.
</para>
-<sect2 id="tcpip_names">
+<sect2 id='TCPIP_Names'>
<title>TCP/IP Names</title>
<!-- .XS -->
<!-- (SN TCP/IP Names -->
@@ -279,7 +279,7 @@ that may be requested. For example:
</literallayout>
</sect2>
-<sect2 id="decnet_names">
+<sect2 id='DECnet_Names'>
<title>DECnet Names</title>
<!-- .XS -->
<!-- (SN DECnet Names -->
@@ -309,7 +309,7 @@ requested. For example:
</sect2>
</sect1>
-<sect1 id="protocol">
+<sect1 id='Protocol'>
<title>Protocol</title>
<!-- .XS -->
<!-- (SN Protocol -->
@@ -377,7 +377,7 @@ A type with a prefix "LISTof" represents a counted list of
elements of that type, as in: LISTofCARD8
</para>
-<sect2 id="data_types">
+<sect2 id='Data_Types'>
<title>Data Types</title>
<!-- .XS -->
<!-- (SN Data Types -->
@@ -1104,7 +1104,7 @@ This structure is padded to 32-bit alignment.
</blockquote>
</sect2>
-<sect2 id="requests">
+<sect2 id='Requests'>
<title>Requests</title>
<!-- .XS -->
<!-- (SN Requests -->
@@ -2650,7 +2650,7 @@ the client that made the connection.
</blockquote>
</sect2>
-<sect2 id="errors">
+<sect2 id='Errors'>
<title>Errors</title>
<!-- .XS -->
<!-- (SN Errors -->
@@ -2977,7 +2977,7 @@ Additional errors may be defined by extensions.
</blockquote>
</sect2>
-<sect2 id="events">
+<sect2 id='Events'>
<title>Events</title>
<!-- .XS -->
<!-- (SN Events -->
@@ -3116,7 +3116,7 @@ Additional events may be defined by extensions.
</sect2>
</sect1>
-<sect1 id="protocol_encoding">
+<sect1 id='Protocol_Encoding'>
<title>Protocol Encoding</title>
<!-- .XS -->
<!-- (SN Protocol Encoding -->
@@ -3164,7 +3164,7 @@ multiple of four:
pad(e) = (4 - (e mod 4)) mod 4
</literallayout>
-<sect2 id="data_types_2">
+<sect2 id='Data_Types_2'>
<title>Data Types</title>
<!-- .XS -->
<!-- (SN Data Types -->
@@ -3363,7 +3363,7 @@ n PROPINFO property data
</literallayout>
</sect2>
-<sect2 id="requests_2">
+<sect2 id='Requests_2'>
<title>Requests</title>
<para><emphasis role="bold">open connection</emphasis></para>
<literallayout class="monospaced">
@@ -3760,7 +3760,7 @@ p unused, p=pad(m)
</literallayout>
</sect2>
-<sect2 id="errors_2">
+<sect2 id='Errors_2'>
<title>Errors</title>
<literallayout class="monospaced">
@@ -3894,7 +3894,7 @@ p unused, p=pad(m)
</literallayout>
</sect2>
-<sect2 id="events_2">
+<sect2 id='Events_2'>
<title>Events</title>
<literallayout class="monospaced">
<emphasis role="bold">KeepAlive</emphasis>
@@ -3928,7 +3928,7 @@ p unused, p=pad(m)
</sect2>
</sect1>
-<sect1 id="acknowledgements">
+<sect1 id='Acknowledgements'>
<title>Acknowledgements</title>
<!-- .XS -->
<!-- (SN Acknowledgements -->
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>
diff --git a/specs/fsproto.xml b/specs/fsproto.xml
index 7525665..9a0c5c8 100644
--- a/specs/fsproto.xml
+++ b/specs/fsproto.xml
@@ -20,10 +20,9 @@
</author>
</authorgroup>
<edition>Revised May 2, 1994</edition>
+ <copyright><year>1991</year><holder>Network Computing Devices, Inc.</holder></copyright>
<legalnotice>
-
-<para role="multiLicensing">Copyright © 1991 Network Computing Devices, Inc.</para>
<para>
Permission to use, copy, modify, distribute, and sell this
documentation for any purpose is hereby granted without fee,
@@ -33,6 +32,9 @@ 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.
</para>
+</legalnotice>
+
+<legalnotice>
<para role="multiLicensing">Copyright © 1994 X Consortium</para>
<para>
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -46,16 +48,14 @@ 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.
</para>
-
<para>
-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.
</para>
-
<para>
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
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>
diff --git a/specs/fsproto.xml b/specs/fsproto.xml
index baaca83..7525665 100644
--- a/specs/fsproto.xml
+++ b/specs/fsproto.xml
@@ -10,7 +10,7 @@
<articleinfo>
<title>The X Font Service Protocol</title>
- <subtitle>X Window System Standard</subtitle>
+ <subtitle>X Consortium Standard</subtitle>
<releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
<releaseinfo>Version 2.0</releaseinfo>
<authorgroup>
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>
diff --git a/specs/fsproto.xml b/specs/fsproto.xml
index f9b7bef..baaca83 100644
--- a/specs/fsproto.xml
+++ b/specs/fsproto.xml
@@ -19,12 +19,11 @@
<affiliation><orgname>Network Computing Devices, Inc.</orgname></affiliation>
</author>
</authorgroup>
- <copyright><year>1991</year><holder>Network Computing Devices, Inc.</holder></copyright>
- <copyright><year>1994</year><holder>X Consortium</holder></copyright>
<edition>Revised May 2, 1994</edition>
<legalnotice>
+<para role="multiLicensing">Copyright © 1991 Network Computing Devices, Inc.</para>
<para>
Permission to use, copy, modify, distribute, and sell this
documentation for any purpose is hereby granted without fee,
@@ -34,6 +33,7 @@ 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.
</para>
+<para role="multiLicensing">Copyright © 1994 X Consortium</para>
<para>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
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>
diff --git a/specs/fsproto.xml b/specs/fsproto.xml
index a3f4fcb..f9b7bef 100644
--- a/specs/fsproto.xml
+++ b/specs/fsproto.xml
@@ -16,15 +16,11 @@
<authorgroup>
<author>
<firstname>Jim</firstname><surname>Fulton</surname>
- <affiliation><orgname>
-Network Computing Devices, Inc.
- </orgname></affiliation>
+ <affiliation><orgname>Network Computing Devices, Inc.</orgname></affiliation>
</author>
</authorgroup>
- <corpname>X Consortium Standard</corpname>
<copyright><year>1991</year><holder>Network Computing Devices, Inc.</holder></copyright>
<copyright><year>1994</year><holder>X Consortium</holder></copyright>
- <affiliation><orgname>X Consortium</orgname></affiliation>
<edition>Revised May 2, 1994</edition>
<legalnotice>
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>
diff --git a/specs/fsproto.xml b/specs/fsproto.xml
index 9db5dbd..a3f4fcb 100644
--- a/specs/fsproto.xml
+++ b/specs/fsproto.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd";>
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd";
+[
+<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+]>
<article id="fsproto">
@@ -8,6 +11,7 @@
<articleinfo>
<title>The X Font Service Protocol</title>
<subtitle>X Window System Standard</subtitle>
+ <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
<releaseinfo>Version 2.0</releaseinfo>
<authorgroup>
<author>
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>
diff --git a/specs/fsproto.xml b/specs/fsproto.xml
index 5f119c5..9db5dbd 100644
--- a/specs/fsproto.xml
+++ b/specs/fsproto.xml
@@ -21,7 +21,6 @@ Network Computing Devices, Inc.
<copyright><year>1991</year><holder>Network Computing Devices, Inc.</holder></copyright>
<copyright><year>1994</year><holder>X Consortium</holder></copyright>
<affiliation><orgname>X Consortium</orgname></affiliation>
- <productnumber>X Version 11, Release 6.8</productnumber>
<edition>Revised May 2, 1994</edition>
<legalnotice>
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>
diff --git a/docbook.am b/docbook.am
index 9377f5b..bba4d54 100644
--- a/docbook.am
+++ b/docbook.am
@@ -30,11 +30,9 @@ 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_CSS_STYLESHEET_FLAGS = --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
XMLTO_HTML_FLAGS = \
$(XMLTO_SEARCHPATH_FLAGS) \
$(XMLTO_HTML_STYLESHEET_FLAGS) \
- $(XMLTO_HTML_CSS_STYLESHEET_FLAGS) \
$(XMLTO_HTML_OLINK_FLAGS)
shelf_DATA += $(docbook:.xml=.html)
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>
diff --git a/docbook.am b/docbook.am
index 2ffb7e6..9377f5b 100644
--- a/docbook.am
+++ b/docbook.am
@@ -21,74 +21,84 @@ shelf_DATA =
dist_shelf_DATA = $(docbook) $(chapters)
if HAVE_XMLTO
-#
-# Generate DocBook/XML output formats with or without stylesheets
-#
-
-# Stylesheets are available if the package xorg-sgml-doctools is installed
if HAVE_STYLESHEETS
-# The location where all cross reference databases are installed
-sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs
-masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml"
-XMLTO_FLAGS = \
- --searchpath "$(XORG_SGML_PATH)/X11" \
- --stringparam target.database.document=$(masterdb) \
- --stringparam current.docid="$(<:.xml=)" \
- --stringparam collect.xref.targets="no"
-
-XMLTO_XHTML_FLAGS = \
- -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \
- --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
-
-XMLTO_FO_FLAGS = \
- -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
-endif 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_CSS_STYLESHEET_FLAGS = --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
+XMLTO_HTML_FLAGS = \
+ $(XMLTO_SEARCHPATH_FLAGS) \
+ $(XMLTO_HTML_STYLESHEET_FLAGS) \
+ $(XMLTO_HTML_CSS_STYLESHEET_FLAGS) \
+ $(XMLTO_HTML_OLINK_FLAGS)
shelf_DATA += $(docbook:.xml=.html)
-%.html: %.xml $(chapters)
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $<
-
-if HAVE_FOP
-shelf_DATA += $(docbook:.xml=.pdf) $(docbook:.xml=.ps)
-%.pdf: %.xml $(chapters)
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop pdf $<
-%.ps: %.xml $(chapters)
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop ps $<
-endif HAVE_FOP
+%.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_FLAGS) $(XMLTO_XHTML_FLAGS) txt $<
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $<
endif HAVE_XMLTO_TEXT
-#
-# Generate documents cross-reference target databases
-#
+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 $<
-# This is only possible if the xorg-sgml-doctools package is installed
-if HAVE_STYLESHEETS
-if HAVE_XSLTPROC
+shelf_DATA += $(docbook:.xml=.ps)
+%.ps: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $<
+endif HAVE_FOP
-# DocBook/XML generated document cross-reference database
-shelf_DATA += $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
+# Generate documents cross-reference target databases
+if HAVE_XSLTPROC
-# Generate DocBook/XML document cross-reference database
-# Flags for the XSL Transformation processor generating xref target databases
-XSLTPROC_FLAGS = \
+XSLT_SEARCHPATH_FLAGS = \
--path "$(XORG_SGML_PATH)/X11" \
- --stringparam targets.filename "$@" \
- --stringparam collect.xref.targets "only" \
- --nonet --xinclude
-
+ --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) $(XSLTPROC_FLAGS) \
- http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $<
+ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $<
-%.fo.db: %.xml $(chapters)
- $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
- http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
+shelf_DATA += $(docbook:.xml=.pdf.db)
+%.pdf.db: %.xml $(chapters)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $<
endif HAVE_XSLTPROC
endif HAVE_STYLESHEETS
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>
diff --git a/docbook.am b/docbook.am
index 5864c9e..2ffb7e6 100644
--- a/docbook.am
+++ b/docbook.am
@@ -20,6 +20,7 @@ shelf_DATA =
# DocBook/XML file with chapters, appendix and images it includes
dist_shelf_DATA = $(docbook) $(chapters)
+if HAVE_XMLTO
#
# Generate DocBook/XML output formats with or without stylesheets
#
@@ -91,5 +92,6 @@ XSLTPROC_FLAGS = \
endif HAVE_XSLTPROC
endif HAVE_STYLESHEETS
+endif HAVE_XMLTO
CLEANFILES = $(shelf_DATA)
diff --git a/specs/Makefile.am b/specs/Makefile.am
index 8bee1c7..4035d4b 100644
--- a/specs/Makefile.am
+++ b/specs/Makefile.am
@@ -1,6 +1,5 @@
if ENABLE_SPECS
-if HAVE_XMLTO
# Main DocBook/XML files (DOCTYPE book)
docbook = fsproto.xml
@@ -11,5 +10,4 @@ shelfdir = $(docdir)
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
-endif HAVE_XMLTO
endif ENABLE_SPECS
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
diff --git a/configure.ac b/configure.ac
index 308f744..cc5a760 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ XORG_ENABLE_SPECS
XORG_WITH_XMLTO(0.0.22)
XORG_WITH_FOP
XORG_WITH_XSLTPROC
-XORG_CHECK_SGML_DOCTOOLS(1.7)
+XORG_CHECK_SGML_DOCTOOLS(1.8)
AC_OUTPUT([Makefile
specs/Makefile
diff --git a/docbook.am b/docbook.am
index 3cf21e8..5864c9e 100644
--- a/docbook.am
+++ b/docbook.am
@@ -71,7 +71,7 @@ if HAVE_STYLESHEETS
if HAVE_XSLTPROC
# DocBook/XML generated document cross-reference database
-sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
+shelf_DATA += $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
# Generate DocBook/XML document cross-reference database
# Flags for the XSL Transformation processor generating xref target databases
@@ -92,4 +92,4 @@ XSLTPROC_FLAGS = \
endif HAVE_XSLTPROC
endif HAVE_STYLESHEETS
-CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
+CLEANFILES = $(shelf_DATA)
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>
diff --git a/configure.ac b/configure.ac
index 1719886..308f744 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,15 +4,16 @@ AC_INIT([FontsProto], [2.1.1],
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.7)
AC_OUTPUT([Makefile
specs/Makefile
diff --git a/docbook.am b/docbook.am
new file mode 100644
index 0000000..3cf21e8
--- /dev/null
+++ b/docbook.am
@@ -0,0 +1,95 @@
+#
+# 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)
+
+#
+# Generate DocBook/XML output formats with or without stylesheets
+#
+
+# Stylesheets are available if the package xorg-sgml-doctools is installed
+if HAVE_STYLESHEETS
+
+# The location where all cross reference databases are installed
+sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs
+masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml"
+XMLTO_FLAGS = \
+ --searchpath "$(XORG_SGML_PATH)/X11" \
+ --stringparam target.database.document=$(masterdb) \
+ --stringparam current.docid="$(<:.xml=)" \
+ --stringparam collect.xref.targets="no"
+
+XMLTO_XHTML_FLAGS = \
+ -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \
+ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
+
+XMLTO_FO_FLAGS = \
+ -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+endif HAVE_STYLESHEETS
+
+shelf_DATA += $(docbook:.xml=.html)
+%.html: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $<
+
+if HAVE_FOP
+shelf_DATA += $(docbook:.xml=.pdf) $(docbook:.xml=.ps)
+%.pdf: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop pdf $<
+%.ps: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop ps $<
+endif HAVE_FOP
+
+if HAVE_XMLTO_TEXT
+shelf_DATA += $(docbook:.xml=.txt)
+%.txt: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) txt $<
+endif HAVE_XMLTO_TEXT
+
+#
+# Generate documents cross-reference target databases
+#
+
+# This is only possible if the xorg-sgml-doctools package is installed
+if HAVE_STYLESHEETS
+if HAVE_XSLTPROC
+
+# DocBook/XML generated document cross-reference database
+sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
+
+# Generate DocBook/XML document cross-reference database
+# Flags for the XSL Transformation processor generating xref target databases
+XSLTPROC_FLAGS = \
+ --path "$(XORG_SGML_PATH)/X11" \
+ --stringparam targets.filename "$@" \
+ --stringparam collect.xref.targets "only" \
+ --nonet --xinclude
+
+%.html.db: %.xml $(chapters)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+ http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $<
+
+%.fo.db: %.xml $(chapters)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+ http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
+
+endif HAVE_XSLTPROC
+endif HAVE_STYLESHEETS
+
+CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
diff --git a/specs/.gitignore b/specs/.gitignore
index 6fa5c31..92946c9 100644
--- a/specs/.gitignore
+++ b/specs/.gitignore
@@ -2,3 +2,4 @@
*.ps
*.pdf
*.txt
+*.db
diff --git a/specs/Makefile.am b/specs/Makefile.am
index 848c3a4..8bee1c7 100644
--- a/specs/Makefile.am
+++ b/specs/Makefile.am
@@ -1,61 +1,15 @@
-#
-# 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)
-
-if HAVE_FOP
-doc_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
-endif
-
-if HAVE_XMLTO_TEXT
-doc_DATA += $(doc_sources:.xml=.txt)
-endif
-
-if HAVE_STYLESHEETS
-XMLTO_FLAGS = -m $(XSL_STYLESHEET) \
- --stringparam html.stylesheet=$(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 $<
+# Main DocBook/XML files (DOCTYPE book)
+docbook = fsproto.xml
-.xml.pdf:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)
-.xml.ps:
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
endif HAVE_XMLTO
endif ENABLE_SPECS
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>
diff --git a/specs/fsproto.xml b/specs/fsproto.xml
index 95530f1..5f119c5 100644
--- a/specs/fsproto.xml
+++ b/specs/fsproto.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd";>
-<book id="fsproto">
+<article id="fsproto">
-<bookinfo>
+<articleinfo>
<title>The X Font Service Protocol</title>
<subtitle>X Window System Standard</subtitle>
<releaseinfo>Version 2.0</releaseinfo>
@@ -63,10 +63,8 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from the X Consortium.
</para>
</legalnotice>
-</bookinfo>
+</articleinfo>
-<chapter>
-<title>TITLE</title>
<sect1 id="introduction">
<title>Introduction</title>
<para>
@@ -3970,7 +3968,6 @@ the X Consortium.
</biblioentry>
</bibliography>
-</chapter>
<appendix id="suggested_licensing_policies">
<title>Suggested Licensing Policies</title>
@@ -4081,4 +4078,4 @@ handling of ECONNREFUSED in XConnDis.c).
</listitem>
</itemizedlist>
</appendix>
-</book>
+</article>
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>
diff --git a/specs/.gitignore b/specs/.gitignore
index 09b6a89..6fa5c31 100644
--- a/specs/.gitignore
+++ b/specs/.gitignore
@@ -2,4 +2,3 @@
Reply to: