x11proto-record: Changes to 'upstream-unstable'
configure.ac | 13 +-
docbook.am | 105 +++++++++++++++++++++
specs/.gitignore | 2
specs/Makefile.am | 63 +------------
specs/record.xml | 259 +++++++++++++++++++++++++++---------------------------
5 files changed, 253 insertions(+), 189 deletions(-)
New commits:
commit 32236c56b7015a98d845bb1836817328a307edce
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Mar 22 20:46:36 2012 -0700
recordproto 1.14.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index c96a87e..e037f2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([RecordProto], [1.14.1],
+AC_INIT([RecordProto], [1.14.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 10028272314500dd2e17e5ae7efa0a2d4d118c13
Author: Matt Dew <marcoz@osource.org>
Date: Fri Jan 13 23:20:09 2012 -0700
informaltable cleanup
On certain tables, add top and bottom borders to table
header and a bottom border to the table. This matches
what those tables in the old pdfs looked like.
the <?dbfo keep-together='always'> prevents tables from
splitting across pages. Useful for tiny tables.
Converting the colwidth to a floating point,
IE, 1* -> 1.0* cleans up these build errors:
WARNING: table-layout="fixed" and column-width unspecified
=> falling back to proportional-column-width(1)
Signed-off-by: Matt Dew <marcoz@osource.org>
diff --git a/specs/record.xml b/specs/record.xml
index 8d7bd0a..842a5d6 100644
--- a/specs/record.xml
+++ b/specs/record.xml
@@ -461,27 +461,28 @@ type is a resource identifier for a server record context.
</para>
<informaltable frame="none">
- <tgroup cols='3' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
- <colspec colname='c2' colsep="0" colwidth="1*"/>
- <colspec colname='c3' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
+ <colspec colname='c2' colwidth="1.0*"/>
+ <colspec colname='c3' colwidth="4.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>RANGE8:</entry>
<entry>[first, last:</entry>
<entry>CARD8]</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>RANGE16:</entry>
<entry>[first, last:</entry>
<entry>CARD16]</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>EXTRANGE:</entry>
<entry>[major:</entry>
<entry>RANGE8</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>minor:</entry>
<entry>RANGE16]</entry>
@@ -491,52 +492,53 @@ type is a resource identifier for a server record context.
</informaltable>
<informaltable frame="none">
- <tgroup cols='3' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
- <colspec colname='c2' colsep="0" colwidth="1*"/>
- <colspec colname='c3' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.5*"/>
+ <colspec colname='c2' colwidth="1.0*"/>
+ <colspec colname='c3' colwidth="4.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>RECORDRANGE:</entry>
<entry>[core-requests:</entry>
<entry>RANGE8</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>core-replies:</entry>
<entry>RANGE8</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>ext-requests:</entry>
<entry>EXTRANGE</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>ext-replies:</entry>
<entry>EXTRANGE</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>delivered-events:</entry>
<entry>RANGE8</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>device-events:</entry>
<entry>RANGE8</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>errors:</entry>
<entry>RANGE8</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>client-started:</entry>
<entry>BOOL</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>client-died:</entry>
<entry>BOOL]</entry>
@@ -692,22 +694,23 @@ this RECORDRANGE.
</itemizedlist>
<informaltable frame="none">
- <tgroup cols='3' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
- <colspec colname='c2' colsep="0" colwidth="1*"/>
- <colspec colname='c3' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
+ <colspec colname='c2' colwidth="1.0*"/>
+ <colspec colname='c3' colwidth="2.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>ELEMENT_HEADER:</entry>
<entry>[from-server-time:</entry>
<entry>BOOL</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>from-client-time:</entry>
<entry>BOOL</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>from-client-sequence:</entry>
<entry>BOOL]</entry>
@@ -844,17 +847,18 @@ It is an error to explicitly register the data connection.
</para>
<informaltable frame="none">
- <tgroup cols='3' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
- <colspec colname='c2' colsep="0" colwidth="1*"/>
- <colspec colname='c3' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
+ <colspec colname='c2' colwidth="1.0*"/>
+ <colspec colname='c3' colwidth="3.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>CLIENT_INFO:</entry>
<entry>[client-resource:</entry>
<entry>CLIENTSPEC</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>intercepted-protocol:</entry>
<entry>LISTofRECORDRANGE]</entry>
@@ -946,30 +950,31 @@ minor version thirteen (13).
</para>
<informaltable frame="none">
- <tgroup cols='1' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>context</emphasis>: RC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>element-header</emphasis>: ELEMENT_HEADER
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>client-specifiers</emphasis>: LISTofCLIENTSPEC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>ranges</emphasis>: LISTofRECORDRANGE
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
Errors:
<function>Match ,</function>
@@ -1064,30 +1069,31 @@ resources.
</para>
<informaltable frame="none">
- <tgroup cols='1' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>context</emphasis>: RC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>element-header</emphasis>: ELEMENT_HEADER
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>client-specifiers</emphasis>: LISTofCLIENTSPEC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>ranges</emphasis>: LISTofRECORDRANGE
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
Errors:
<function>Match ,</function>
@@ -1190,20 +1196,21 @@ resources.
</para>
<informaltable frame="none">
- <tgroup cols='1' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>context</emphasis>: RC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>client-specifiers</emphasis>: LISTofCLIENTSPEC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
Errors:
<function>Match ,</function>
@@ -1283,40 +1290,41 @@ A client is unregistered automatically when it disconnects.
</para>
<informaltable frame="none">
- <tgroup cols='1' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>context</emphasis>: RC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
->
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>enabled</emphasis>: BOOL
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>element-header</emphasis>: ELEMENT_HEADER
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>intercepted-clients</emphasis>: LISTofCLIENT_INFO
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
Errors:
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<function>RecordContext</function>
</entry>
@@ -1366,20 +1374,20 @@ error results.
</para>
<informaltable frame="none">
- <tgroup cols='1' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
+ <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>context</emphasis>: RC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
->+
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>category</emphasis>:
{<function>FromServer</function>, <function>FromClient</function>,
@@ -1389,37 +1397,37 @@ error results.
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>element-header</emphasis>: ELEMENT_HEADER
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>client-swapped</emphasis>: BOOL
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>id-base</emphasis>: XIDBASE
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>server-time</emphasis>: TIMESTAMP
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>recorded-sequence-number</emphasis>: CARD32
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>data</emphasis>: LISTofBYTE
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
Errors:
<function>Match</function>,
@@ -1600,15 +1608,16 @@ error results.
</para>
<informaltable frame="none">
- <tgroup cols='1' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>context</emphasis>: RC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
Errors:
<function>RecordContext</function>
commit 5a7a2820665a495df32694d90b6f5192dd53547e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Sep 20 20:12:54 2011 -0400
specs: refactor copyright license text for multi licening
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/specs/record.xml b/specs/record.xml
index 00a0d6b..8d7bd0a 100644
--- a/specs/record.xml
+++ b/specs/record.xml
@@ -22,29 +22,24 @@
<affiliation><orgname>X Consortium</orgname></affiliation>
</editor>
</authorgroup>
- <corpname>X Consortium Standard</corpname>
- <affiliation><orgname>X Consortium</orgname></affiliation>
- <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+ <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+ <copyright><year>1994</year><holder>Network Computing Devices, Inc.</holder>
+ </copyright>
<legalnotice>
<para>
-Copyright © 1994 Network Computing Devices, Inc.
-</para>
-<para>
Permission to use, copy, modify, distribute, and sell this
documentation for any purpose is hereby granted without fee,
provided that the above copyright notice and this permission
notice appear in all copies. Network Computing Devices, Inc.
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.
+provided “as is” without express or implied warranty.
</para>
</legalnotice>
<legalnotice>
-<para>
-Copyright © 1994, 1995 X Consortium
-</para>
+<para role="multiLicensing">Copyright © 1994, 1995 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
@@ -61,7 +56,7 @@ in all copies or substantial portions of the Software.
</para>
<para>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+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
@@ -76,6 +71,7 @@ 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.
</para>
+<para>X Window System is a trademark of The Open Group.</para>
</legalnotice>
</bookinfo>
commit 233ed0eef7526ae02223359851be51e43240652b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Sep 12 16:54:45 2011 -0400
docs: use the &fullrelvers; entity to set X11 release information
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/specs/record.xml b/specs/record.xml
index ea88356..00a0d6b 100644
--- a/specs/record.xml
+++ b/specs/record.xml
@@ -1,6 +1,9 @@
<?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";>
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd";
+[
+<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+]>
<!-- lifted from troff+ms+XMan by doclifter -->
@@ -21,7 +24,7 @@
</authorgroup>
<corpname>X Consortium Standard</corpname>
<affiliation><orgname>X Consortium</orgname></affiliation>
- <releaseinfo>X Version 11, Release 6.7</releaseinfo>
+ <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
<legalnotice>
<para>
commit 9ecf07de57da54009c5bb4567655996f69ba8deb
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/record.xml b/specs/record.xml
index c1d5d32..ea88356 100644
--- a/specs/record.xml
+++ b/specs/record.xml
@@ -21,7 +21,6 @@
</authorgroup>
<corpname>X Consortium Standard</corpname>
<affiliation><orgname>X Consortium</orgname></affiliation>
- <productnumber>Version 1.13</productnumber>
<releaseinfo>X Version 11, Release 6.7</releaseinfo>
<legalnotice>
commit c8d4e3eddc07889f0bc493884f120e741226c28b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Sep 11 08:51:02 2011 -0400
specs: use more appropriate docbook element to get "Edited by"
The proper element to use is <editor>.
The <contrib> was a hack to insert text and showed up in the wrong location
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/specs/record.xml b/specs/record.xml
index 89cfd72..c1d5d32 100644
--- a/specs/record.xml
+++ b/specs/record.xml
@@ -14,11 +14,10 @@
<firstname>Martha</firstname><surname>Zimet</surname>
<affiliation><orgname>Network Computing Devices, Inc.</orgname></affiliation>
</author>
- <othercredit>
- <contrib>edited by</contrib>
+ <editor>
<firstname>Stephen</firstname><surname>Gildea</surname>
<affiliation><orgname>X Consortium</orgname></affiliation>
- </othercredit>
+ </editor>
</authorgroup>
<corpname>X Consortium Standard</corpname>
<affiliation><orgname>X Consortium</orgname></affiliation>
commit 1950143424ea47973613bc1dbec805e8a32aa97b
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 d1011e878c92be804fe896f9adf2b686c01f2172
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 cbba0d1e4665b585804b5de33c5ed1a4c3b19727
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 b90bbb3..624abb7 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 = record.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 b045d4c13967bd061f6a104136152e841bc432b5
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 f8cd978..c96a87e 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 dcc64434a3e79931b05fc807906189dfa3a9ddd0
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 34dd4ce..f8cd978 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,15 +4,16 @@ AC_INIT([RecordProto], [1.14.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) \
Reply to: