slidy backend: Setting the 'role' attribute to 'outline' in a bulleted

or numbered list allows nested lists to be expanded and collapsed
using the mouse.

5 files changed, 63 insertions, 7 deletions

diff --git a/doc/asciidoc.txt b/doc/asciidoc.txt
index 6df8db4..784185e 100644
--- a/doc/asciidoc.txt
+++ b/doc/asciidoc.txt
@@ -3666,6 +3666,7 @@ header. Here's an example header:
   :icons:
   :data-uri:
   :lang: en
+  :encoding: iso-8859-1
 
 =====================================================================
 
diff --git a/doc/slidy-example.txt b/doc/slidy-example.txt
index 4bf72f6..aab2dd3 100644
--- a/doc/slidy-example.txt
+++ b/doc/slidy-example.txt
@@ -49,6 +49,38 @@ sed pede litora.
 . Volutpat tristique nec.
 
 
+Outline Elements
+----------------
+The following list is a Slidy 'outline' list -- nested bulleted or
+numbered lists are expanded when the enclosing list item (the ones
+with blue bullet points or numbers) are clicked.
+
+[role="outline"]
+- Rhoncus pede justo.
+  * Rhoncus pede justo.
+  * Velit pede dolor.
+
+- Velit pede dolor.
+  * Iaculis commodo et.
++
+NOTE: 'Note' admonition paragraph.
+
+  * Volutpat tristique nec.
++
+image::images/tiger.png[]
+  * Iaculis commodo et.
+  * Volutpat tristique nec.
+
+- Iaculis commodo et.
+[role="outline"]
+  . Rhoncus pede justo.
+  ** Velit pede dolor.
+  ** Iaculis commodo et.
+  . Volutpat tristique nec.
+
+- Volutpat tristique nec.
+
+
 AsciiDoc Elements
 -----------------
 NOTE: 'Note' admonition paragraph.
diff --git a/doc/slidy.txt b/doc/slidy.txt
index 578581a..b9225cf 100644
--- a/doc/slidy.txt
+++ b/doc/slidy.txt
@@ -74,6 +74,12 @@ If you set the 'copyright' attribute it will be displayed in the Slidy
 menu bar at the bottom of the slide. If the 'copyright' attribute is
 not define then the author name, if it is defined, will be displayed.
 
+outline::
+Setting the 'role' attribute to 'outline' in a bulleted or numbered
+list allows nested lists to be expanded and collapsed using the mouse.
+Nested lists are expanded when an enclosing list item (the ones with
+blue bullet points or numbers) is clicked.
+
 
 Stylesheets
 -----------
diff --git a/slidy.conf b/slidy.conf
index b4ddc10..fa484b0 100644
--- a/slidy.conf
+++ b/slidy.conf
@@ -15,15 +15,15 @@ template::[listingblock]
 </div></div>
 
 [listtags-bulleted]
-list=<div class="ulist{style? {style}}{compact-option? compact}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ul class="{incremental?incremental}{role? {role}}">|</ul></div>
+list={title?<div class="title">{title}</div>}<ul{id? id="{id}"} class="{incremental? incremental}{role? {role}}">|</ul>
 item=<li>|</li>
-text=<p>|</p>
+text=<span>|</span>
 
 [listtags-numbered]
 # The start attribute is not valid XHTML 1.1 but all browsers support it.
-list=<div class="olist{style? {style}}{compact-option? compact}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ol class="{style}{incremental? incremental}{role? {role}}"{start? start="{start}"}>|</ol></div>
+list={title?<div class="title">{title}</div>}<ol{id? id="{id}"} class="{style}{incremental? incremental}{role? {role}}"{start? start="{start}"}>|</ol>
 item=<li>|</li>
-text=<p>|</p>
+text=<span>|</span>
 
 [listtags-labeled]
 list=<div class="dlist{compact-option? compact}{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<dl class="{incremental? incremental}{role? {role}}">|</dl></div>
diff --git a/stylesheets/slidy.css b/stylesheets/slidy.css
index 38df214..bbb790e 100644
--- a/stylesheets/slidy.css
+++ b/stylesheets/slidy.css
@@ -422,7 +422,24 @@ div.initial_prompt { display: none; visibility: hidden }
   div.slide.first-slide { page-break-before: avoid }
 }
 
-/* SJR */
-div.olist, div.ulist {
-  margin: 0.8em 0.2em;
+
+/* SJR: AsciiDoc slidy backend tweaks */
+
+ol, ul {
+  margin: 0.8em 1.5em 0.8em 1.8em;
+}
+li > ul, li > ol {
+  margin-top: 0.5em;
+}
+
+.outline > li.folded,
+.outline > li.unfolded {
+  color: #527bbd;
+}
+ul > li{ color: #aaa; }
+ul > li > *, ol > li > * { color: black; }
+
+li {
+  margin-top: 0.5em;
+  margin-bottom: 0.5em;
 }