From 01df5d59e56a1b060568f8cad2e89f7eea22fc70 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 29 Aug 2011 08:51:20 +0200
Subject: xwininfo libX11 libXmu libxcb mesa xserver xkeyboard-config git
 update 29 aug 2011

---
 libXmu/doc/Xmu.xml | 16 +++++++---------
 libXmu/docbook.am  |  4 +++-
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'libXmu')

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)
-- 
cgit v1.2.3