From 34e9b10fb97db9748dd5df084afc69ed139ed572 Mon Sep 17 00:00:00 2001
From: Kris Maglione <kris@vimperator.org>
Date: Tue, 3 Nov 2009 00:56:28 -0500
Subject: [PATCH] Some manual help formatting tweaks. Why can troff handle
 stuff this but HTML can't?

---
 common/content/help.xsl         | 17 +++++++++++------
 common/content/style.js         |  1 +
 common/locale/en-US/options.xml | 14 +++++++-------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/common/content/help.xsl b/common/content/help.xsl
index 13385061..77fddffe 100644
--- a/common/content/help.xsl
+++ b/common/content/help.xsl
@@ -174,14 +174,19 @@
 
     <!-- Items {{{1 -->
 
+    <xsl:template match="liberator:strut" mode="pass-2">
+        <div style="clear: both"/>
+    </xsl:template>
     <xsl:template match="liberator:item" mode="pass-2">
         <div liberator:highlight="HelpItem">
-            <xsl:apply-templates select="liberator:tags|liberator:spec"/>
-            <hr style="border: 0; height: 0; margin: 0; width: 100%; float: right;"/>
-            <div liberator:highlight="HelpOptInfo">
-                <xsl:apply-templates select="liberator:type|liberator:default"/>
-                <div style="clear: both;"/>
-            </div>
+            <xsl:apply-templates select="liberator:tags|liberator:spec|liberator:strut"/>
+            <xsl:if test="not(liberator:description/@short)">
+                <hr style="border: 0; height: 0; margin: 0; width: 100%; float: right;"/>
+                <div liberator:highlight="HelpOptInfo">
+                    <xsl:apply-templates select="liberator:type|liberator:default"/>
+                    <div style="clear: both;"/>
+                </div>
+            </xsl:if>
             <xsl:apply-templates select="liberator:description"/>
             <div style="clear: both;"/>
         </div>
diff --git a/common/content/style.js b/common/content/style.js
index 36660e4e..73ca032e 100644
--- a/common/content/style.js
+++ b/common/content/style.js
@@ -163,6 +163,7 @@ Highlights.prototype.CSS = <![CDATA[
     HelpOptInfo                                 display: inline-block; margin-bottom: 1ex;
 
     HelpParagraph,html|p,liberator://help/*     display: block; margin: 1em 0em;
+    HelpParagraph:first-child                   margin-top: 0;
     HelpSpec                                    display: block; margin-left: -10em; float: left; clear: left; color: #527BBD;
 
     HelpString                                  display: inline-block; color: green; font-weight: normal; vertical-align: text-top;
diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml
index 12981a59..05be799f 100644
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -29,14 +29,14 @@
 <item>
     <tags>:set :se</tags>
     <spec>:se[t]</spec>
-    <description>
+    <description short="true">
         <p>Show all options that differ from their default value.</p>
     </description>
 </item>
 
 <item>
     <spec>:se[t] all</spec>
-    <description>
+    <description short="true">
         <p>Show all options.</p>
     </description>
 </item>
@@ -52,11 +52,11 @@
 <item>
     <spec>:se[t] <a>option</a> […]</spec>
     <description>
-        <p>
-            Toggle option: set, switch it on.
-            Number option: show value.
-            String option: show value.
-        </p>
+        <dl>
+            <dt>Toggle option</dt> <dd>set, switch it on.</dd>
+            <dt>Number option</dt> <dd>show value.</dd>
+            <dt>String option</dt> <dd>show value.</dd>
+        </dl>
     </description>
 </item>