titleindex, inline combination produces strange lists

[Ryan Witt]

When you use the "titlelist" option along with "inline", each title appears in it's own ordered list.

This is probably not what users want, since it results in something like:

---

1. FooPage : A very nice page

1. BarPage : Another nice page

1. BazPage : Yet a third nice page

---

See all the 1's? Anyways, the blatantly obvious fix is to place the <ol> tag outside the whole thing. Here's a patch for the simple case:

macro.py

@@ -159 +159 @@
             out.write("<div class='wiki-toc'>\n")
         if heading:
             out.write("<h4>%s</h4>\n" % heading)
+        if params['title_index']:
+            out.write('<ol>')
         for pagename in pagenames:
             if params['title_index']:
                 li_class = pagename.startswith(current_page) and ' class="active"' or ''
@@ -167 +169 @@
                 all_pages = list(WikiSystem(self.env).get_pages(prefix))
                 if all_pages:
                     all_pages.sort()
-                    out.write('<ol>')
+                    if not params['title_index']:
+                        out.write('<ol>')
                     for page in all_pages:
                         page_text, _ = get_page_text(page)
 
@@ -178 +181 @@
                             title = re.sub('<[^>]*>','', title) # Strip all tags
                             header = ': ' + wiki_to_oneliner(title, self.env)
                         out.write('<li%s> <a href="%s">%s</a> %s</li>\n' % (li_class, self.env.href.wiki(page), page, header))
-                    out.write('</ol>')
+                    if not params['title_index']:
+                        out.write('</ol>')
                 else :
                     out.write('<div class="system-message"><strong>Error: No page matching %s found</strong></div>' % prefix)
             else:
@@ -188 +192 @@
                     formatter.format(current_page, page, page_text, out, params['min_depth'], params['max_depth'])
                 else:
                     out.write('<div class="system-message"><strong>Error: Page %s does not exist</strong></div>' % pagename)
+        if params['title_index']:
+            out.write('</ol>')
         if not inline:
             out.write("</div>\n")
         return out.getvalue()

This is the fix I'm running on my own trac installation.

[Christian Boos]

Ok. See also #2.

[Christian Boos]

(In [1904]) Improve a bit the display of the TOC in inline mode (although it's still quite bad until #2 gets solved...). Fixes #642.