From b9843dce0ba9f1f117aeb45c11dd6a601ab958cb Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 16 Jul 2012 11:07:54 -0400 Subject: [PATCH] genindex is 100% valid --- doc/build/templates/genindex.mako | 35 +++++++++++++++------------- doc/build/templates/static_base.mako | 2 +- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/doc/build/templates/genindex.mako b/doc/build/templates/genindex.mako index fce20f28db..0a25b6724b 100644 --- a/doc/build/templates/genindex.mako +++ b/doc/build/templates/genindex.mako @@ -14,7 +14,7 @@ % for i, (key, entries) in enumerate(genindexentries):

${key}

-
+
<% breakat = genindexcounts[i] // 2 @@ -32,30 +32,33 @@ % else: ${entryname|h} % endif + % if subitems: -
- % for subentryname, subentrylinks in subitems: -
${subentryname|h} - % for j, (unknown, link) in enumerate(subentrylinks[1:]): - [${j}] - % endfor -
- % endfor -
- % endif - <% +
+ % for subentryname, subentrylinks in subitems: +
${subentryname|h} + % for j, (unknown, link) in enumerate(subentrylinks[1:]): + [${j}] + % endfor +
+ % endfor +
+ % endif + + <% numitems = numitems + 1 + len(subitems) - %> - % if numcols <2 and numitems > breakat: + %> + % if numcols <2 and numitems > breakat: <% numcols = numcols + 1 %>
-% endif + % endif % endfor -
+
+
% endfor <%def name="sidebarrel()"> diff --git a/doc/build/templates/static_base.mako b/doc/build/templates/static_base.mako index 134c0d00a2..40bf1c68ff 100644 --- a/doc/build/templates/static_base.mako +++ b/doc/build/templates/static_base.mako @@ -1,7 +1,7 @@ - + ${metatags and metatags or ''} -- 2.47.2