Merged ref.css into reference.css, deleted ref.css, and updated

stylesheet to use reference.css instead of ref.css. Also changed
individual reference pages to use graphical admonitions.

diff --git a/xsl/common/refentry.xsl b/xsl/common/refentry.xsl
index 4dc35d85e09a5155f99d08c9b3ce4fc578706641..2a0c1a3538bb7b68dcb57ce665c95dd8c5e64305 100644 (file)
--- a/xsl/common/refentry.xsl
+++ b/xsl/common/refentry.xsl
@@ -73,7 +73,7 @@
     the <tag>releaseinfo</tag> element.</para>
 
     <para>Taking all that in mind, the
-    <function>get.refentry.info</function> function tries to gather
+    <function>get.refentry.metadata</function> function tries to gather
     metadata from a <tag>refentry</tag> element and its ancestor
     elements in an intelligent and user-configurable way. The basic
     mechanism used in the XPath expressions throughout this stylesheet
@@ -82,7 +82,7 @@
     <tag>refentry</tag> itself, or on its nearest ancestor.</para>
 
     <note>
-      <para>The <function>get.refentry.info</function> function is
+      <para>The <function>get.refentry.metadata</function> function is
       actually just sort of a "driver" function; it calls other
       functions that do the actual data collection, then returns the
       data as a set.</para>

diff --git a/xsl/doc/css/ref.css b/xsl/doc/css/ref.css
deleted file mode 100644 (file)
index 9f53f2d..0000000
--- a/xsl/doc/css/ref.css
+++ /dev/null
@@ -1,31 +0,0 @@
-div.informalexample        { background-color: #d5dee3;
-                             border-top-width: 2px;
-                             border-top-style: double;
-                             border-top-color: #d3d3d3;
-                             border-bottom-width: 2px;
-                             border-bottom-style: double;
-                             border-bottom-color: #d3d3d3;
-                             padding: 4px;
-                             margin: 0em;
-                             margin-left: 2em;
-                           }
-
-pre.programlisting         { whitespace: pre;
-                             font-family: monospace;
-                             background-color: #d5dee3;
-                             border-top-width: 1px;
-                             border-top-style: single;
-                             border-top-color: #d3d3d3;
-                             border-bottom-width: 1px;
-                             border-bottom-style: single;
-                             border-bottom-color: #d3d3d3;
-                             padding: 4px;
-                             margin: 0em;
-                           }
-
-div.informalexample pre    { whitespace: pre;
-                             font-family: monospace;
-                             border-top-width: 0px;
-                             border-bottom-width: 0px;
-                             padding: 0px;
-                           }

diff --git a/xsl/doc/css/reference.css b/xsl/doc/css/reference.css
index a3fe7356453b6e0b874e9d6601b94f4b5ed42db3..653e0ff00a226082ac742d54e671df59ee13e318 100644 (file)
--- a/xsl/doc/css/reference.css
+++ b/xsl/doc/css/reference.css
@@ -10,3 +10,34 @@ div.note {
   padding: 5px;
 }
 
+div.informalexample        { background-color: #d5dee3;
+                             border-top-width: 2px;
+                             border-top-style: double;
+                             border-top-color: #d3d3d3;
+                             border-bottom-width: 2px;
+                             border-bottom-style: double;
+                             border-bottom-color: #d3d3d3;
+                             padding: 4px;
+                             margin: 0em;
+                             margin-left: 2em;
+                           }
+
+pre.programlisting         { whitespace: pre;
+                             font-family: monospace;
+                             background-color: #d5dee3;
+                             border-top-width: 1px;
+                             border-top-style: single;
+                             border-top-color: #d3d3d3;
+                             border-bottom-width: 1px;
+                             border-bottom-style: single;
+                             border-bottom-color: #d3d3d3;
+                             padding: 4px;
+                             margin: 0em;
+                           }
+
+div.informalexample pre    { whitespace: pre;
+                             font-family: monospace;
+                             border-top-width: 0px;
+                             border-bottom-width: 0px;
+                             padding: 0px;
+                           }

diff --git a/xsl/docsrc/clrefentry.xsl b/xsl/docsrc/clrefentry.xsl
index 570005242dd1a443b3f21f1881852029c3fdffc8..424961de92db3ccc0036682c5385f458a7aa5a8c 100644 (file)
--- a/xsl/docsrc/clrefentry.xsl
+++ b/xsl/docsrc/clrefentry.xsl
@@ -11,7 +11,12 @@
 <xsl:param name="refentry.separator" select="0"/>
 
 <!-- n.b. reference pages are one directory down, so we point back up -->
-<xsl:param name="html.stylesheet" select="'../css/ref.css'"/>
+<xsl:param name="html.stylesheet" select="'../css/reference.css'"/>
+<xsl:param name="admon.graphics" select="1"></xsl:param>
+<xsl:param name="admon.textlabel" select="0"></xsl:param>
+<xsl:param name="admon.graphics.path">../images/</xsl:param>
+<xsl:param name="admon.graphics.extension" select="'.png'"></xsl:param>
+<xsl:param name="admon.style"/>
 
 <xsl:template match="src:fragment" mode="label.markup">
   <xsl:text>&#xA7;</xsl:text>