aboutsummaryrefslogtreecommitdiff
path: root/libXmu
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-08-29 08:51:20 +0200
committermarha <marha@users.sourceforge.net>2011-08-29 08:51:20 +0200
commit01df5d59e56a1b060568f8cad2e89f7eea22fc70 (patch)
tree9db83037fd85d0974b60fc1a05e0665083f26000 /libXmu
parentfd1f4d9fe3ea67fa6def8ee4927a8f71e0440f12 (diff)
downloadvcxsrv-01df5d59e56a1b060568f8cad2e89f7eea22fc70.tar.gz
vcxsrv-01df5d59e56a1b060568f8cad2e89f7eea22fc70.tar.bz2
vcxsrv-01df5d59e56a1b060568f8cad2e89f7eea22fc70.zip
xwininfo libX11 libXmu libxcb mesa xserver xkeyboard-config git update 29
aug 2011
Diffstat (limited to 'libXmu')
-rw-r--r--libXmu/doc/Xmu.xml16
-rw-r--r--libXmu/docbook.am4
2 files changed, 10 insertions, 10 deletions
diff --git a/libXmu/doc/Xmu.xml b/libXmu/doc/Xmu.xml
index 8afe6882f..b1817991d 100644
--- a/libXmu/doc/Xmu.xml
+++ b/libXmu/doc/Xmu.xml
@@ -978,7 +978,13 @@ specifies the logo height
</varlistentry>
</variablelist>
- <figure id="xlogo" float="1" pgwide="0">
+This function draws the &ldquo;official&rdquo; X Window System logo
+(<xref linkend="xlogo"/>). The bounding box
+of the logo in the drawable is given by x, y, width, and height. The logo
+itself is filled using gcFore, and the rest of the rectangle is filled using
+gcBack.
+ </para>
+ <figure id="xlogo" pgwide="0">
<title>The X Logo</title>
<mediaobject>
<imageobject>
@@ -986,14 +992,6 @@ specifies the logo height
</imageobject>
</mediaobject>
</figure>
-
-This function draws the &ldquo;official&rdquo; X Window System logo
-(<xref linkend="xlogo"/>). The bounding box
-of the logo in the drawable is given by x, y, width, and height. The logo
-itself is filled using gcFore, and the rest of the rectangle is filled using
-gcBack.
- </para>
-
<para id="XmuCreateStippledPixmap">
<indexterm zone="XmuCreateStippledPixmap">
<primary><function>XmuCreateStippledPixmap</function></primary>
diff --git a/libXmu/docbook.am b/libXmu/docbook.am
index 2ffb7e60a..4809ce3be 100644
--- a/libXmu/docbook.am
+++ b/libXmu/docbook.am
@@ -41,8 +41,10 @@ XMLTO_XHTML_FLAGS = \
-x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \
--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
+# Caution: img.src.path *must* not be used for html. Pdf copies the image.
XMLTO_FO_FLAGS = \
- -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+ -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl \
+ --stringparam img.src.path=$(abs_builddir)/
endif HAVE_STYLESHEETS
shelf_DATA += $(docbook:.xml=.html)