xorg-sgml-doctools: Changes to 'upstream-unstable'
Makefile.am | 1
README | 19 +--
configure.ac | 2
masterdb/Makefile.am | 20 ---
masterdb/masterdb.xml | 129 ++++++++++++-----------
xorg-chunk.xsl | 68 ++++++++++++
xorg-xhtml.xsl | 11 +
xorg.css | 277 ++++++++++++++++++++++++++++++++++++++++++--------
8 files changed, 396 insertions(+), 131 deletions(-)
New commits:
commit 2ce8b9381538e48b57e5ab7e11dad412fd9b8429
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Sep 7 09:46:51 2011 -0400
Version bump: 1.10
The masterdbs for olink have changed.
Currently only bigreqproto has olinks to libX11.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 7ac2be0..d9ece0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xorg-sgml-doctools], [1.9],
+AC_INIT([xorg-sgml-doctools], [1.10],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xorg-sgml-doctools])
AC_CONFIG_SRCDIR([Makefile.am])
commit fc347e2cd78c2a95b85a961eb110206b6f126b08
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Sep 8 13:42:47 2011 -0400
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 adding
an xsl:template to the customization layer. The content of xorg.css must not
be encoded due to the '<' character.
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/xorg-chunk.xsl b/xorg-chunk.xsl
index 3d85c6f..93b18b5 100644
--- a/xorg-chunk.xsl
+++ b/xorg-chunk.xsl
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-
+<!DOCTYPE xsl:stylesheet [
+<!ENTITY xorgcss SYSTEM "xorg.css">
+]>
<!--
X.Org DocBook/XML customization
@@ -10,6 +12,13 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version='1.0'>
<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl"/>
+<!-- Embedding CSS styles http://www.sagehill.net/docbookxsl/HtmlHead.html#EmbedCSS -->
+<xsl:template name="user.head.content">
+<style type="text/css">
+<xsl:text disable-output-escaping="yes">&xorgcss;</xsl:text>
+</style>
+</xsl:template>
+
<!-- Reference Pages HTML/FO Parameters -->
<!-- The formatting of a function element will include generated parentheses -->
diff --git a/xorg-xhtml.xsl b/xorg-xhtml.xsl
index fc2e95d..d9b7b3e 100644
--- a/xorg-xhtml.xsl
+++ b/xorg-xhtml.xsl
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-
+<!DOCTYPE xsl:stylesheet [
+<!ENTITY xorgcss SYSTEM "xorg.css">
+]>
<!--
X.Org DocBook/XML customization
@@ -10,6 +12,13 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version='1.0'>
<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/>
+<!-- Embedding CSS styles http://www.sagehill.net/docbookxsl/HtmlHead.html#EmbedCSS -->
+<xsl:template name="user.head.content">
+<style type="text/css">
+<xsl:text disable-output-escaping="yes">&xorgcss;</xsl:text>
+</style>
+</xsl:template>
+
<!-- Reference Pages HTML/FO Parameters -->
<!-- The formatting of a function element will include generated parentheses -->
diff --git a/xorg.css b/xorg.css
index 0b7fcda..278ed7f 100644
--- a/xorg.css
+++ b/xorg.css
@@ -69,13 +69,9 @@ body {
}
/*
- * <!DOCTYPE book PUBLIC ... >
- *
* Books have a title page, a preface, some chapters and appendices,
* a glossary, an index and a bibliography, in that order.
*
- * <!DOCTYPE article PUBLIC ... >
- *
* An Article has no preface and no chapters. It has sections, appendices,
* a glossary, an index and a bibliography.
*/
@@ -255,7 +251,7 @@ div.bibliography>div.titlepage h2.title {
/*
* Selection: variable lists, informal tables and tables
*
- * Note the <xsl:param name="variablelist.as.table" select="1"/> in xorg-xhtml.xsl
+ * Note the parameter name "variablelist.as.table" in xorg-xhtml.xsl
* A table with rows and columns is constructed inside div.variablelist
*
* Set the left margin so it is indented to the right
commit 9d312bd9b62b8dc1b13ba427aafee99440df6a4b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Sep 6 21:01:46 2011 -0400
CSS: authors and affiliation spacing
The objective is to have more spacing between each author so their affiliation
is visually grouped with its author. The previous method was not reliable as
it was making an assumption about the preceeding element.
The new method of reducing the bottom margin for the author should be more
reliable.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/xorg.css b/xorg.css
index 08e3fb7..0b7fcda 100644
--- a/xorg.css
+++ b/xorg.css
@@ -104,6 +104,7 @@ div.article>div.section>div.titlepage h2.title {
* These authors are not always contained inside an authorgroup.
* They can be contained inside a lot of different parent types where they might
* not be centered.
+ * Reducing the margin at the bottom makes a visual separation between authors
* We specify here the ones on the title page, others may be added based on merit.
*/
div.titlepage .authorgroup,
@@ -114,17 +115,14 @@ div.titlepage .corpcredit,
div.titlepage .editor,
div.titlepage .othercredit {
text-align: center;
+ margin-bottom: 0.25em;
}
/*
* Selection: the affiliation of various types of authors and collaborators,
* individuals or corporate.
- *
- * The affiliation should be closer to the author such that it visually
- * groups the affiliation with the author.
*/
div.titlepage .affiliation {
- margin-top: -0.8em;
text-align: center;
}
commit 93f58fd482c58f669e37df1e415cfde06324b548
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Sep 5 15:35:55 2011 -0400
masterdb: add olink support for chunked html
For olinks to chunked html, the masterdb cannot contain the baseuri
attribute. The xsl parameter olink.base.uri needs to be used in makefiles
for non chunked html while the chunked html does not use it.
The txt and ps documents cannot be an end point of olinks, so no target
dbs will be generated for those formats, hence no masterdb needed either.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/README b/README
index e057938..c5e262b 100644
--- a/README
+++ b/README
@@ -11,10 +11,9 @@ A new feature with version 1.7 is references to documents in other
packages. For example a protocol specifications may refer to another
one or to a library implementing it.
-This feature works with PDF, HTML, PS (and epub?) generated documents
-and will generate links to the other versions of the same type, i.e. html
-docs will link to other html docs, and pdf docs will link to other pdf
-docs.
+This feature works with PDF and HTML generated documents and will generate
+links to the other versions of the same type, i.e. html docs will link to
+other html docs, and pdf docs will link to other pdf docs.
Due to the modular nature of the X window System and the flexibility
it provides to O/S builders, one should not expect all links to
@@ -90,11 +89,11 @@ These files are generated and installed while the documents are being build.
This is what a Docbook/XML reference from docA to docB looks like (docA.xml):
<olink targetdoc='docB' targetptr='docBfragment'>Title</olink>
-This is what an HTML reference from docA to docB looks like (docA.html):
+This is what a non-chunked HTML reference from docA to docB looks like (docA.html):
<a href="docB.html#docBfragment" class="olink">Title</a>
This is what an HTML targetdoc for docB looks like (docB.html.db):
-<div element="article" href="#docBfragment" number="" targetptr="docBfragment">
+<div element="article" href="docB.html#docBfragment" number="" targetptr="docBfragment">
This is what an HTML reference from docA to docB looks like (docA.html)
when the reference cannot be resolved:
@@ -114,14 +113,14 @@ This can be caused by one or more of the following:
Some pitfalls
-------------------------
<book id="docA"> in docA.xml: the id must match the file basename.
-In xorg-*.xsl, <xsl:param name="current.docid" select="/*/@id"/>
+In docs Makefile.am --stringparam current.docid="$(<:.xml=)"
supplies docid for *.db. The document id must be unique across
all documents.
-The baseuri attribute in masterdb.xml is required for pdf/ps references
-to work. It cannot be replaced with olink.base.uri in the makefile.
+The baseuri attribute in masterdb.xml cannot be used as it conflicts for
+documents generated in chunked html.
-The pdf/ps "inside the document" references only started working with
+The pdf "inside the document" references only started working with
docbook-xsl v 1.76.1 which is not yet available to your favorite O/S.
In xorg-fo.xsl, insert.olink.pdf.frag must be set to zero which allows
the reference to at least point to the top of the document.
diff --git a/masterdb/Makefile.am b/masterdb/Makefile.am
index 4b8044d..fd571b0 100644
--- a/masterdb/Makefile.am
+++ b/masterdb/Makefile.am
@@ -2,29 +2,17 @@
master_PRE = masterdb.xml
sgmldbs_DATA = \
$(master_PRE:xml=html.xml) \
- $(master_PRE:xml=pdf.xml) \
- $(master_PRE:xml=ps.xml) \
- $(master_PRE:xml=txt.xml)
+ $(master_PRE:xml=pdf.xml)
EXTRA_DIST = $(master_PRE)
CLEANFILES = $(sgmldbs_DATA)
%.html.xml: %.xml
- $(AM_V_GEN)$(SED) -e 's|__ext__|html|g' \
- -e 's|__db__|html|g' \
- -e 's|@datarootdir[@]|$(datarootdir)|g' < $< > $@
-
-%.txt.xml: %.xml
- $(AM_V_GEN)$(SED) -e 's|__ext__|txt|g' \
+ $(AM_V_GEN)$(SED) \
-e 's|__db__|html|g' \
-e 's|@datarootdir[@]|$(datarootdir)|g' < $< > $@
%.pdf.xml: %.xml
- $(AM_V_GEN)$(SED) -e 's|__ext__|pdf|g' \
- -e 's|__db__|fo|g' \
- -e 's|@datarootdir[@]|$(datarootdir)|g' < $< > $@
-
-%.ps.xml: %.xml
- $(AM_V_GEN)$(SED) -e 's|__ext__|ps|g' \
- -e 's|__db__|fo|g' \
+ $(AM_V_GEN)$(SED) \
+ -e 's|__db__|pdf|g' \
-e 's|@datarootdir[@]|$(datarootdir)|g' < $< > $@
diff --git a/masterdb/masterdb.xml b/masterdb/masterdb.xml
index a3944dd..5f732b8 100644
--- a/masterdb/masterdb.xml
+++ b/masterdb/masterdb.xml
@@ -37,24 +37,24 @@ listed here. This allows crosslinking between documents.
<dir name="doc">
<!-- Libraries -->
<dir name="libICE">
- <document targetdoc="ICElib" baseuri="ICElib.__ext__">
+ <document targetdoc="ICElib">
<xi:include href="@datarootdir@/doc/libICE/ICElib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="ice" baseuri="ice.__ext__">
+ <document targetdoc="ice">
<xi:include href="@datarootdir@/doc/libICE/ice.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="libSM">
- <document targetdoc="SMlib" baseuri="SMlib.__ext__">
+ <document targetdoc="SMlib">
<xi:include href="@datarootdir@/doc/libSM/SMlib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="xsmp" baseuri="xsmp.__ext__">
+ <document targetdoc="xsmp">
<xi:include href="@datarootdir@/doc/libSM/xsmp.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
@@ -62,7 +62,7 @@ listed here. This allows crosslinking between documents.
</dir>
<dir name="libX11">
<dir name="libX11">
- <document targetdoc="libX11" baseuri="libX11.__ext__">
+ <document targetdoc="libX11">
<xi:include href="@datarootdir@/doc/libX11/libX11/libX11.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
@@ -70,28 +70,28 @@ listed here. This allows crosslinking between documents.
</dir>
<dir name="i18n">
<dir name="compose">
- <document targetdoc="libX11-keys" baseuri="libX11-keys.__ext__">
+ <document targetdoc="libX11-keys">
<xi:include href="@datarootdir@/doc/libX11/i18n/compose/libX11-keys.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="framework">
- <document targetdoc="framework" baseuri="framework.__ext__">
+ <document targetdoc="framework">
<xi:include href="@datarootdir@/doc/libX11/i18n/framework/framework.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="localedb">
- <document targetdoc="localedb" baseuri="localedb.__ext__">
+ <document targetdoc="localedb">
<xi:include href="@datarootdir@/doc/libX11/i18n/localedb/localedb.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="trans">
- <document targetdoc="trans" baseuri="trans.__ext__">
+ <document targetdoc="trans">
<xi:include href="@datarootdir@/doc/libX11/i18n/trans/trans.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
@@ -99,14 +99,14 @@ listed here. This allows crosslinking between documents.
</dir>
</dir>
<dir name="XIM">
- <document targetdoc="xim" baseuri="xim.__ext__">
+ <document targetdoc="xim">
<xi:include href="@datarootdir@/doc/libX11/XIM/xim.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="XKB">
- <document targetdoc="xkblib" baseuri="xkblib.__ext__">
+ <document targetdoc="xkblib">
<xi:include href="@datarootdir@/doc/libX11/XKB/xkblib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
@@ -114,74 +114,74 @@ listed here. This allows crosslinking between documents.
</dir>
</dir>
<dir name="libXaw">
- <document targetdoc="libXaw" baseuri="libXaw.__ext__">
+ <document targetdoc="libXaw">
<xi:include href="@datarootdir@/doc//libXaw/libXaw.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="libXdmcp">
- <document targetdoc="xdmcp" baseuri="xdmcp.__ext__">
+ <document targetdoc="xdmcp">
<xi:include href="@datarootdir@/doc//libXdmcp/xdmcp.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="libXext">
- <document targetdoc="dbelib" baseuri="dbelib.__ext__">
+ <document targetdoc="dbelib">
<xi:include href="@datarootdir@/doc/libXext/dbelib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="dpmslib" baseuri="dpmslib.__ext__">
+ <document targetdoc="dpmslib">
<xi:include href="@datarootdir@/doc/libXext/dpmslib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="shapelib" baseuri="shapelib.__ext__">
+ <document targetdoc="shapelib">
<xi:include href="@datarootdir@/doc/libXext/shapelib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="synclib" baseuri="synclib.__ext__">
+ <document targetdoc="synclib">
<xi:include href="@datarootdir@/doc/libXext/synclib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="xtest1" baseuri="xtest1.__ext__">
+ <document targetdoc="xtest1">
<xi:include href="@datarootdir@/doc/libXext/xtest1.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="libXi">
- <document targetdoc="inputlib" baseuri="inputlib.__ext__">
+ <document targetdoc="inputlib">
<xi:include href="@datarootdir@/doc/libXi/inputlib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="libXmu">
- <document targetdoc="Xmu" baseuri="Xmu.__ext__">
+ <document targetdoc="Xmu">
<xi:include href="@datarootdir@/doc/libXmu/Xmu.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="libXtst">
- <document targetdoc="recordlib" baseuri="recordlib.__ext__">
+ <document targetdoc="recordlib">
<xi:include href="@datarootdir@/doc/libXtst/recordlib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="xtestlib" baseuri="xtestlib.__ext__">
+ <document targetdoc="xtestlib">
<xi:include href="@datarootdir@/doc/libXtst/xtestlib.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="xtrans">
- <document targetdoc="xtrans" baseuri="xtrans.__ext__">
+ <document targetdoc="xtrans">
<xi:include href="@datarootdir@/doc/xtrans/xtrans.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
@@ -189,116 +189,116 @@ listed here. This allows crosslinking between documents.
</dir>
<!-- Protocols -->
<dir name="bigreqsproto">
- <document targetdoc="bigreq" baseuri="bigreq.__ext__">
+ <document targetdoc="bigreq">
<xi:include href="@datarootdir@/doc/bigreqsproto/bigreq.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="fontsproto">
- <document targetdoc="fsproto" baseuri="fsproto.__ext__">
+ <document targetdoc="fsproto">
<xi:include href="@datarootdir@/doc/fontsproto/fsproto.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="kbproto">
- <document targetdoc="xkbproto" baseuri="xkbproto.__ext__">
+ <document targetdoc="xkbproto">
<xi:include href="@datarootdir@/doc/kbproto/xkbproto.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="recordproto">
- <document targetdoc="record" baseuri="record.__ext__">
+ <document targetdoc="record">
<xi:include href="@datarootdir@/doc/recordproto/record.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="scrnsaverproto">
- <document targetdoc="saver" baseuri="saver.__ext__">
+ <document targetdoc="saver">
<xi:include href="@datarootdir@/doc/scrnsaverproto/saver.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="xcmiscproto">
- <document targetdoc="xc-misc" baseuri="xc-misc.__ext__">
+ <document targetdoc="xc-misc">
<xi:include href="@datarootdir@/doc/xcmiscproto/xc-misc.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="xextproto">
- <document targetdoc="appgrp" baseuri="appgrp.__ext__">
+ <document targetdoc="appgrp">
<xi:include href="@datarootdir@/doc/xextproto/appgrp.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="dbe" baseuri="dbe.__ext__">
+ <document targetdoc="dbe">
<xi:include href="@datarootdir@/doc/xextproto/dbe.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="dpms" baseuri="dpms.__ext__">
+ <document targetdoc="dpms">
<xi:include href="@datarootdir@/doc/xextproto/dpms.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="evi" baseuri="evi.__ext__">
+ <document targetdoc="evi">
<xi:include href="@datarootdir@/doc/xextproto/evi.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="geproto" baseuri="geproto.__ext__">
+ <document targetdoc="geproto">
<xi:include href="@datarootdir@/doc/xextproto/geproto.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="lbx" baseuri="lbx.__ext__">
+ <document targetdoc="lbx">
<xi:include href="@datarootdir@/doc/xextproto/lbx.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="multibuf" baseuri="multibuf.__ext__">
+ <document targetdoc="multibuf">
<xi:include href="@datarootdir@/doc/xextproto/multibuf.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="security" baseuri="security.__ext__">
+ <document targetdoc="security">
<xi:include href="@datarootdir@/doc/xextproto/security.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="shape" baseuri="shape.__ext__">
+ <document targetdoc="shape">
<xi:include href="@datarootdir@/doc/xextproto/shape.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="shm" baseuri="shm.__ext__">
+ <document targetdoc="shm">
<xi:include href="@datarootdir@/doc/xextproto/shm.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="sync" baseuri="sync.__ext__">
+ <document targetdoc="sync">
<xi:include href="@datarootdir@/doc/xextproto/sync.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="tog-cup" baseuri="tog-cup.__ext__">
+ <document targetdoc="tog-cup">
<xi:include href="@datarootdir@/doc/xextproto/tog-cup.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="xtest" baseuri="xtest.__ext__">
+ <document targetdoc="xtest">
<xi:include href="@datarootdir@/doc/xextproto/xtest.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="xproto">
- <document targetdoc="x11protocol" baseuri="x11protocol.__ext__">
+ <document targetdoc="x11protocol">
<xi:include href="@datarootdir@/doc/xproto/x11protocol.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
@@ -306,109 +306,109 @@ listed here. This allows crosslinking between documents.
</dir>
<!-- X.Org System Documentation -->
<dir name="xorg-docs">
- <document targetdoc="License" baseuri="License.__ext__">
+ <document targetdoc="License">
<xi:include href="@datarootdir@/doc/xorg-docs/License.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="README" baseuri="README.__ext__">
+ <document targetdoc="README">
<xi:include href="@datarootdir@/doc/xorg-docs/README.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="ReleaseNotes" baseuri="ReleaseNotes.__ext__">
+ <document targetdoc="ReleaseNotes">
<xi:include href="@datarootdir@/doc/xorg-docs/ReleaseNotes.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="Versions" baseuri="Versions.__ext__">
+ <document targetdoc="Versions">
<xi:include href="@datarootdir@/doc/xorg-docs/Versions.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
<dir name="fonts">
- <document targetdoc="fonts" baseuri="fonts.__ext__">
+ <document targetdoc="fonts">
<xi:include href="@datarootdir@/doc/xorg-docs/fonts/fonts.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="graphics">
- <document targetdoc="dps" baseuri="dps.__ext__">
+ <document targetdoc="dps">
<xi:include href="@datarootdir@/doc/xorg-docs/graphics/dps.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="input">
- <document targetdoc="XKB-Config" baseuri="XKB-Config.__ext__">
+ <document targetdoc="XKB-Config">
<xi:include href="@datarootdir@/doc/xorg-docs/input/XKB-Config.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="XKB-Enhancing" baseuri="XKB-Enhancing.__ext__">
+ <document targetdoc="XKB-Enhancing">
<xi:include href="@datarootdir@/doc/xorg-docs/input/XKB-Enhancing.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="platforms">
- <document targetdoc="Darwin" baseuri="Darwin.__ext__">
+ <document targetdoc="Darwin">
<xi:include href="@datarootdir@/doc/xorg-docs/platforms/Darwin.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="Solaris" baseuri="Solaris.__ext__">
+ <document targetdoc="Solaris">
<xi:include href="@datarootdir@/doc/xorg-docs/platforms/Solaris.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="ctext">
- <document targetdoc="ctext" baseuri="ctext.__ext__">
+ <document targetdoc="ctext">
<xi:include href="@datarootdir@/doc/xorg-docs/ctext/ctext.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="icccm">
- <document targetdoc="icccm" baseuri="icccm.__ext__">
+ <document targetdoc="icccm">
<xi:include href="@datarootdir@/doc/xorg-docs/icccm/icccm.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="xext">
- <document targetdoc="lbxalg" baseuri="lbxalg.__ext__">
+ <document targetdoc="lbxalg">
<xi:include href="@datarootdir@/doc/xorg-docs/xext/lbxalg.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="xlfd">
- <document targetdoc="xlfd" baseuri="xlfd.__ext__">
+ <document targetdoc="xlfd">
<xi:include href="@datarootdir@/doc/xorg-docs/xlfd/xlfd.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
</dir>
<dir name="Xserver">
- <document targetdoc="appgroup" baseuri="appgroup.__ext__">
+ <document targetdoc="appgroup">
<xi:include href="@datarootdir@/doc/xorg-docs/Xserver/appgroup.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="analysis" baseuri="analysis.__ext__">
+ <document targetdoc="analysis">
<xi:include href="@datarootdir@/doc/xorg-docs/Xserver/analysis.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="secint" baseuri="secint.__ext__">
+ <document targetdoc="secint">
<xi:include href="@datarootdir@/doc/xorg-docs/Xserver/secint.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
</document>
- <document targetdoc="XACE-Spec" baseuri="XACE-Spec.__ext__">
+ <document targetdoc="XACE-Spec">
<xi:include href="@datarootdir@/doc/xorg-docs/Xserver/XACE-Spec.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
@@ -417,7 +417,7 @@ listed here. This allows crosslinking between documents.
</dir>
<!-- X Server -->
<dir name="xorg-server">
- <document targetdoc="Xserver-DTrace" baseuri="Xserver-DTrace.__ext__">
+ <document targetdoc="Xserver-DTrace">
<xi:include href="@datarootdir@/doc/xorg-server/Xserver-DTrace.__db__.db" xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:fallback></xi:fallback>
</xi:include>
commit 2d3a9c663c99958de27827668fd63608b25433de
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Aug 19 20:43:22 2011 -0400
Version bump: 1.9
Mainly for the new xorg-chunk.xsl
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 4ea68dd..7ac2be0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xorg-sgml-doctools], [1.8],
+AC_INIT([xorg-sgml-doctools], [1.9],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xorg-sgml-doctools])
AC_CONFIG_SRCDIR([Makefile.am])
commit cddda1bc9758c612dbfb6188e75e0c06135bd735
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 27 10:33:00 2011 -0400
Review documents cascading style sheet
There is no drastic changes in style, it will go unnoticed
for the most part. Many inconsistencies in titles and headings
were fixed in both books and articles.
The large libX11 specs was used a reference. The border above
each and every section was removed, keeping only level 2 headings.
It alleviates the sense of "being lost". An additional step might be
the section numbering.
The body background and foreground colors are no longer set, which
will not interfere with the user own styling. This should fix #37535.
The figure-float was removed as it was specific for one figure and
did not yield nice results. There is virtually no room for
improvements with what docbook has to offer.
All xorg docs were reviewed to ensure nothing got badly broken.
A few changes in the doc source was made in libX11 and similar
changes need to be done in the remaining xorg docs. They only affect
minor spacing issues.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/xorg.css b/xorg.css
index f779666..08e3fb7 100644
--- a/xorg.css
+++ b/xorg.css
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2011 Gaetan Nadon
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -21,78 +22,276 @@
* DEALINGS IN THE SOFTWARE.
*/
-/* Shared stylesheet for X.Org documentation translated to HTML format */
+/*
+ * Shared stylesheet for X.Org documentation translated to HTML format
+ * http://www.sagehill.net/docbookxsl/UsingCSS.html
+ * http://www.w3schools.com/css/default.asp
+ * https://addons.mozilla.org/en-US/firefox/addon/web-developer/developers
+ * https://addons.mozilla.org/en-US/firefox/addon/font-finder/
+ */
+/*
+ * The sans-serif fonts are considered more legible on a computer screen
+ * http://dry.sailingissues.com/linux-equivalents-verdana-arial.html
+ *
+ */
body {
- font-family: sans-serif;
- background: white;
- color: black;
+ font-family: "Bitstream Vera Sans", "DejaVu Sans", Tahoma, Geneva, Arial, Sans-serif;
+ /* In support of using "em" font size unit, the w3c recommended method */
+ font-size: 100%;
}
-div.sect1 {
- border-top: 1px solid #2b5e82;
+/*
+ * Selection: all elements requiring mono spaced fonts.
+ *
+ * The family names attempt to match the proportionally spaced font
+ * family names such that the same font name is used for both.
+ * We'd like to use Bitstream, for example, in both proportionally and
+ * mono spaced font text.
+ */
+.command,
+.errorcode,
+.errorname,
+.errortype,
+.filename,
+.funcsynopsis,
+.function,
+.parameter,
+.programlisting,
+.property,
+.screen,
+.structname,
+.symbol,
+.synopsis,
+.type
+{
+ font-family: "Bitstream Vera Sans Mono", "DejaVu Sans Mono", Courier, "Liberation Mono", Monospace;
}
-.structname, .property, .errorname, .function, .parameter, .filename,
-.type, .symbol, .funcsynopsis, .synopsis, .screen {
- font-family: monospace;
+/*
+ * <!DOCTYPE book PUBLIC ... >
+ *
+ * Books have a title page, a preface, some chapters and appendices,
+ * a glossary, an index and a bibliography, in that order.
+ *
+ * <!DOCTYPE article PUBLIC ... >
+ *
+ * An Article has no preface and no chapters. It has sections, appendices,
+ * a glossary, an index and a bibliography.
+ */
+
+/*
+ * Selection: book main title and subtitle
+ */
+div.book>div.titlepage h1.title,
+div.book>div.titlepage h2.subtitle {
+ text-align: center;
}
-.funcsynopsis, .synopsis {
- background: #e6e6fa;
- border: 1px solid #aaaaaa;
- padding: 0.5em;
- clear: both;
+/*
+ * Selection: article main title and subtitle
+ */
+div.article>div.titlepage h2.title,
+div.article>div.titlepage h3.subtitle,
+div.article>div.sect1>div.titlepage h2.title,
+div.article>div.section>div.titlepage h2.title {
+ text-align: center;
}
-.programlisting {
- background: #ffefd5;
- margin: 0 1.0em;
- padding-top: 0.5em;
+/*
+ * Selection: various types of authors and collaborators, individuals or corporate
+ *
+ * These authors are not always contained inside an authorgroup.
+ * They can be contained inside a lot of different parent types where they might
+ * not be centered.
+ * We specify here the ones on the title page, others may be added based on merit.
+ */
+div.titlepage .authorgroup,
+div.titlepage .author,
+div.titlepage .collab,
+div.titlepage .corpauthor,
+div.titlepage .corpcredit,
+div.titlepage .editor,
+div.titlepage .othercredit {
+ text-align: center;
+}
+
+/*
+ * Selection: the affiliation of various types of authors and collaborators,
+ * individuals or corporate.
+ *
+ * The affiliation should be closer to the author such that it visually
+ * groups the affiliation with the author.
+ */
+div.titlepage .affiliation {
+ margin-top: -0.8em;
+ text-align: center;
}
+/*
+ * Selection: product release information (X Version 11, Release 7)
+ *
+ * The releaseinfo element can be contained inside a lot of different parent
+ * types where it might not be centered.
+ * We specify here the one on the title page, others may be added based on merit.
+ */
+div.titlepage p.releaseinfo {
+ font-weight: bold;
+ text-align: center;
+}
+
+/*
+ * Selection: publishing date
+ */
+div.titlepage .pubdate {
+ text-align: center;
+}
+
+/*
+ * The legal notices are displayed in smaller sized fonts
+ * Justification is only supported in IE and therefore not requested.
+ *
+ */
+.legalnotice {
+ font-size: small;
+ font-style: italic;
+}
+
+/*
+ * 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
+ */
+div.book>div.toc>p,
+div.article>div.toc>p {
+ font-size: 1.5em;
+ text-align: center;
+}
+
+/*
+ * Selection: major sections of a book or an article
+ *
+ * Unlike books, articles do not have a titlepage element for appendix.
+ * Using the selector "div.titlepage h2.title" would be too general.
+ */
+div.book>div.preface>div.titlepage h2.title,
+div.book>div.chapter>div.titlepage h2.title,
+div.article>div.sect1>div.titlepage h2.title,
+div.article>div.section>div.titlepage h2.title,
+div.book>div.appendix>div.titlepage h2.title,
+div.article>div.appendix h2.title,
+div.glossary>div.titlepage h2.title,
+div.index>div.titlepage h2.title,
+div.bibliography>div.titlepage h2.title {
+ /* Add a border top over the major parts, just like printed books */
+ /* The Gray color is already used for the ruler over the main ToC. */
+ border-top-style: solid;
+ border-top-width: 2px;
+ border-top-color: Gray;
+ /* Put some space between the border and the title */
+ padding-top: 0.2em;
+ text-align: center;
+}
+
+/*
+ * A Screen is a verbatim environment for displaying text that the user might
+ * see on a computer terminal. It is often used to display the results of a command.
+ *
Reply to: