libXmu: Branch 'master'

[Alan Coopersmith]

 doc/Makefile.am |    2 +-
 doc/Xmu.css     |    9 ++++++++-
 doc/Xmu.xml     |   12 +++++++++++-
 doc/xlogo.svg   |   45 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+), 3 deletions(-)

New commits:
commit a4a87ddfa4948c3f5c210ab7a472b65569ae0e64
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Jun 8 21:20:58 2010 -0700

    Show X logo as a figure for XmuDrawLogo
    
    Because we can.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6656cbd..82dd2a4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -22,7 +22,7 @@
 #
 
 if ENABLE_DOCS
-dist_doc_DATA = Xmu.xml
+dist_doc_DATA = Xmu.xml xlogo.svg
 
 if HAVE_XMLTO
 doc_DATA = Xmu.txt Xmu.html $(srcdir)/Xmu.css
diff --git a/doc/Xmu.css b/doc/Xmu.css
index bdb7d9c..33de915 100644
--- a/doc/Xmu.css
+++ b/doc/Xmu.css
@@ -40,6 +40,7 @@ div.sect1 {
   background: #e6e6fa; /* #eeeeee; */
   border: 1px solid #aaaaaa;
   padding: 0.5em;
+  clear: both;
 }
 
 .programlisting { 
@@ -48,7 +49,7 @@ div.sect1 {
   padding-top: 0.5em;
 }
 
-.funcsynopsis p, table p, .synopsis p { 
+.funcsynopsis p, table p, .synopsis p, .figure p {
   margin: 0;
 }
 
@@ -75,3 +76,9 @@ h1, .author, .pubdate, .abstract {
   background: yellow;
   padding-left: 0.5em;
 }
+
+.figure-float {
+  float: right;
+  margin-left: 0.5em;
+}
+
diff --git a/doc/Xmu.xml b/doc/Xmu.xml
index 4b6ada7..34abad7 100644
--- a/doc/Xmu.xml
+++ b/doc/Xmu.xml
@@ -839,7 +839,17 @@ specifies the logo height
 	</varlistentry>
       </variablelist>
 
-This function draws the &ldquo;official&rdquo; X Window System logo.  The bounding box
+      <figure id="xlogo" float="1" pgwide="0">
+	<title>The X Logo</title>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata id="xlogo-svg" format="SVG" fileref="xlogo.svg"/>
+	  </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.
diff --git a/doc/xlogo.svg b/doc/xlogo.svg
new file mode 100644
index 0000000..9c1168b
--- /dev/null
+++ b/doc/xlogo.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel"
+   width="55"
+   height="55"
+   xml:space="preserve"
+   sodipodi:docname="xlogo.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <title>X Window System Logo</title>
+  <metadata><rdf:RDF><cc:Work rdf:about="">
+	<dc:format>image/svg+xml</dc:format>
+	<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+	<dc:title>X Window System Logo</dc:title>
+	<dc:contributor><cc:Agent><dc:title>Designed by Danny Cheng
+Converted to EPS by Stephen Gildea
+Converted from EPS to SVG by Inkscape</dc:title></cc:Agent></dc:contributor>
+	<cc:license rdf:resource="" />
+      </cc:Work></rdf:RDF></metadata>
+  <g transform="matrix(0.1,0,0,-0.1,0,50)">
+    <path
+      d="M 440,440 350,440 0,0 90,0"
+      style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    <path
+      d="m 40,0 180,220 50,0 L 90,0 40,0 z m 360,440 -180,-220 -50,0 180,220"
+      style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    <path
+      d="M 0,440 110,440 440,0 330,0"
+      style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    <path
+      d="M 400,440 390,440 40,0 50,0"
+      style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  </g>
+</svg>