xorg-sgml-doctools: Changes to 'upstream-unstable'
configure.ac | 2 +-
defs.ent | 20 ++++++++++----------
masterdb/masterdb.xml | 7 +++++++
xorg-fo.xsl | 17 +++++++++++++++++
xorg.css | 12 ++++++++++++
5 files changed, 47 insertions(+), 11 deletions(-)
New commits:
commit db5ba2206922fd238da096f93053891e706abc92
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jun 4 21:43:27 2012 -0700
xorg-sgml-doctools 1.11 (X11R7.7)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index e473015..780c6fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xorg-sgml-doctools], [1.10.99.901],
+AC_INIT([xorg-sgml-doctools], [1.11],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xorg-sgml-doctools])
AC_CONFIG_SRCDIR([Makefile.am])
commit 8f413801f0f5ef4b79a6e9df8f7898dece8e932d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jun 4 21:41:44 2012 -0700
Set defs.ent values for X11R7.7 final release
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/defs.ent b/defs.ent
index 1fd3ffd..e23fd9e 100644
--- a/defs.ent
+++ b/defs.ent
@@ -4,7 +4,7 @@
<!-- since we don't do micro (7.x.y) releases of the katamari, *relvers
are now the same as *fullrelvers -->
<!ENTITY majorvers "7">
-<!ENTITY reldate "April 2012">
+<!ENTITY reldate "June 2012">
<!ENTITY relvers "7.7">
<!ENTITY fullrelvers "7.7">
<!ENTITY prevrelvers "7.6">
@@ -19,10 +19,10 @@
<!-- These should be set according to which snapshot/release this is -->
<!ENTITY % firstsnap 'IGNORE'>
<!ENTITY % latersnap 'IGNORE'>
-<!ENTITY % snapshot 'INCLUDE'>
-<!ENTITY % notsnapshot 'IGNORE'>
-<!ENTITY % relcandidate 'INCLUDE'>
-<!ENTITY % release 'IGNORE'>
+<!ENTITY % snapshot 'IGNORE'>
+<!ENTITY % notsnapshot 'INCLUDE'>
+<!ENTITY % relcandidate 'IGNORE'>
+<!ENTITY % release 'INCLUDE'>
<!ENTITY % firstrel 'IGNORE'>
<!ENTITY % earlyrel 'IGNORE'>
<!ENTITY % laterrel 'INCLUDE'>
commit 5ce0f55f275142063d0b3cd7d2de90610beb576f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Apr 14 10:20:49 2012 -0700
1.10.99.901 (1.11 RC1) snapshot for X11R7.7 RC1 docs
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index d9ece0a..e473015 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xorg-sgml-doctools], [1.10],
+AC_INIT([xorg-sgml-doctools], [1.10.99.901],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xorg-sgml-doctools])
AC_CONFIG_SRCDIR([Makefile.am])
commit 3fb2214b33409a78632ec72b1e4459d0a38a8ef7
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 31 19:33:34 2012 -0700
Set defs.ent values for X11R7.7 RC1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/defs.ent b/defs.ent
index 22fdccc..1fd3ffd 100644
--- a/defs.ent
+++ b/defs.ent
@@ -4,25 +4,25 @@
<!-- since we don't do micro (7.x.y) releases of the katamari, *relvers
are now the same as *fullrelvers -->
<!ENTITY majorvers "7">
-<!ENTITY reldate "December 2010">
-<!ENTITY relvers "7.6">
-<!ENTITY fullrelvers "7.6">
-<!ENTITY prevrelvers "7.5">
-<!ENTITY prevfullrelvers "7.5">
-<!ENTITY nextrelvers "7.7">
-<!ENTITY nextfullrelvers "7.7">
-<!ENTITY nextfullreldate "2011">
+<!ENTITY reldate "April 2012">
+<!ENTITY relvers "7.7">
+<!ENTITY fullrelvers "7.7">
+<!ENTITY prevrelvers "7.6">
+<!ENTITY prevfullrelvers "7.6">
+<!ENTITY nextrelvers "7.8">
+<!ENTITY nextfullrelvers "7.8">
+<!ENTITY nextfullreldate "2013">
-<!ENTITY whichfullrel "seventh">
-<!ENTITY rcnum "0">
+<!ENTITY whichfullrel "eighth">
+<!ENTITY rcnum "1">
<!-- These should be set according to which snapshot/release this is -->
<!ENTITY % firstsnap 'IGNORE'>
<!ENTITY % latersnap 'IGNORE'>
-<!ENTITY % snapshot 'IGNORE'>
-<!ENTITY % notsnapshot 'INCLUDE'>
-<!ENTITY % relcandidate 'IGNORE'>
-<!ENTITY % release 'INCLUDE'>
+<!ENTITY % snapshot 'INCLUDE'>
+<!ENTITY % notsnapshot 'IGNORE'>
+<!ENTITY % relcandidate 'INCLUDE'>
+<!ENTITY % release 'IGNORE'>
<!ENTITY % firstrel 'IGNORE'>
<!ENTITY % earlyrel 'IGNORE'>
<!ENTITY % laterrel 'INCLUDE'>
commit 0929d29671be0a4a6d321826e6f89dcace413e00
Author: Matt Dew <marcoz@osource.org>
Date: Sat Dec 31 14:37:07 2011 -0700
ToC on separate page in pdfs.
In the PDFs and postscript files docs, the Table of Contents should be on its own page if the
doctype='article'. This matches the behavior with doctype='book' documents.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/xorg-fo.xsl b/xorg-fo.xsl
index 896fcb6..4680db3 100644
--- a/xorg-fo.xsl
+++ b/xorg-fo.xsl
@@ -94,4 +94,11 @@
<xsl:param name="body.font.family">DejaVu Serif</xsl:param>
<xsl:param name="symbol.font.family">serif,Symbol,AR PL UMing CN,AR PL ShanHeiSun Uni,GNU Unifont</xsl:param>
+ <!-- put page breaks before and after the Table of Contents,
+ so that the ToC is on a page by itself -->
+ <xsl:attribute-set name="toc.margin.properties">
+ <xsl:attribute name="break-before">page</xsl:attribute>
+ <xsl:attribute name="break-after">page</xsl:attribute>
+ </xsl:attribute-set>
+
</xsl:stylesheet>
commit c247d759c70d6c2287478703633a718f1bab7326
Author: Matt Dew <marcoz@osource.org>
Date: Sat Dec 31 14:11:47 2011 -0700
ToC on separate page in pdfs.
diff --git a/xorg-fo.xsl b/xorg-fo.xsl
index d57f7ac..896fcb6 100644
--- a/xorg-fo.xsl
+++ b/xorg-fo.xsl
@@ -31,6 +31,16 @@
<!-- SVG will be considered an acceptable image format -->
<xsl:param name="use.svg" select="1"/>
+ <!-- ToC/LoT/Index Generation -->
+ <!-- put page breaks before and after the Table of Contents,
+ so that the ToC is on a page by itself
+ Reference: http://www.sagehill.net/docbookxsl/PrintToc.html
+ -->
+ <xsl:attribute-set name="toc.margin.properties">
+ <xsl:attribute name="break-before">page</xsl:attribute>
+ <xsl:attribute name="break-after">page</xsl:attribute>
+ </xsl:attribute-set>
+
<!-- Pagination and General Styles FO Parameters -->
<!--
Speed up ps & pdf creation by not creating pages with "draft" image,
commit 14c51709c440954bebc9a43c19275e5777af105b
Author: Gaetan Nadon <nadon@memsize.(none)>
Date: Fri Dec 30 20:49:29 2011 -0500
Add libXt entry in masterdb.xml
This enables olink documents cross-referencing.
Signed-off-by: Gaetan Nadon <nadon@memsize.(none)>
diff --git a/masterdb/masterdb.xml b/masterdb/masterdb.xml
index 5f732b8..c40f597 100644
--- a/masterdb/masterdb.xml
+++ b/masterdb/masterdb.xml
@@ -168,6 +168,13 @@ listed here. This allows crosslinking between documents.
</xi:include>
</document>
</dir>
+ <dir name="libXt">
+ <document targetdoc="intrinsics">
+ <xi:include href="@datarootdir@/doc/libXt/intrinsics.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <xi:fallback></xi:fallback>
+ </xi:include>
+ </document>
+ </dir>
<dir name="libXtst">
<document targetdoc="recordlib">
<xi:include href="@datarootdir@/doc/libXtst/recordlib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
commit f79f3f5c7eb592211a7646d57e011594b60515cc
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Sep 18 11:11:30 2011 -0400
CSS style: support styling for multi licensed docs
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.
Also restore the font size to the default "medium" size.
Markup example:
<para role="multiLicensing">Copyright © 1994 X Consortium</para>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/xorg.css b/xorg.css
index 278ed7f..8a3871c 100644
--- a/xorg.css
+++ b/xorg.css
@@ -152,6 +152,18 @@ div.titlepage .pubdate {
}
/*
+ * 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.
+ */
+p.multiLicensing {
+ font-style: normal;
+ font-size: medium;
+}
+
+/*
* Selection: book or article main ToC title
* A paragraph is generated for the title rather than a level 2 heading.
* We do not want to select chapters sub table of contents, only the main one
Reply to: