libXmu: Branch 'master' - 2 commits

[Gaetan Nadon]

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

New commits:
commit 888135ef815766f0421438430ca40809e4f7e411
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Sun Aug 7 21:20:26 2011 -0400

    docbook pdf: add xsl parameter to locate images
    
    Unlike html, pdf/ps requires a full path name to find images,
    but only needs it to make an internal copy of it at build time.
    The image can later be removed and the image still shows up in the pdf doc.
    This allows us to use the absolute builddir.
    
    This parameter must not be used for html which loads the image from disk
    at user read time. The image is removed from builddir after build is done,
    and we do not know where the image will be installed by the distro.
    
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>

diff --git a/docbook.am b/docbook.am
index 2ffb7e6..4809ce3 100644
--- a/docbook.am
+++ b/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)
commit 5ba82aec6547513ea182cbc6cb95b472bbfb9dc5
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Sun Aug 7 20:30:58 2011 -0400

    Xmu.xml: Change layout of the X Logo figure
    
    The floating does not come up right, the figure caption is in the way.
    Move the figure out of the paragraph and below the text.
    
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>

diff --git a/doc/Xmu.xml b/doc/Xmu.xml
index 8afe688..b181799 100644
--- a/doc/Xmu.xml
+++ b/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>