[Python-checkins] python/dist/src/Doc/tools buildindex.py, 1.13, 1.14

[fdrake at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Doc/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv26766

Modified Files:
	buildindex.py 
Log Message:
make the generated HTML more XHTML friendly


Index: buildindex.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/buildindex.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** buildindex.py	16 Oct 2002 15:27:01 -0000	1.13
--- buildindex.py	25 Nov 2003 16:21:00 -0000	1.14
***************
*** 8,11 ****
--- 8,13 ----
  import sys
  
+ from xml.sax.saxutils import quoteattr
+ 
  
  bang_join = "!".join
***************
*** 216,220 ****
  
  def format_column(nodes):
!     strings = ["<dl compact>"]
      append = strings.append
      level = 0
--- 218,222 ----
  
  def format_column(nodes):
!     strings = ["<dl compact='compact'>"]
      append = strings.append
      level = 0
***************
*** 228,232 ****
              count = i + 1
          if count > level:
!             append("<dl compact>" * (count - level) + "\n")
              level = count
          elif level > count:
--- 230,234 ----
              count = i + 1
          if count > level:
!             append("<dl compact='compact'>" * (count - level) + "\n")
              level = count
          elif level > count:
***************
*** 243,247 ****
              else:
                  extra = ""
!             append("\n<dt>%s%s\n<dd>\n%s<dl compact>"
                     % (term, extra, level * DL_LEVEL_INDENT))
          append("\n%s<dt>%s%s</a>"
--- 245,249 ----
              else:
                  extra = ""
!             append("\n<dt>%s%s\n<dd>\n%s<dl compact='compact'>"
                     % (term, extra, level * DL_LEVEL_INDENT))
          append("\n%s<dt>%s%s</a>"
***************
*** 272,276 ****
      else:
          append(format_column(nodes))
-     append("\n<p>\n")
      return null_join(strings)
  
--- 274,277 ----
***************
*** 283,288 ****
      else:
          lettername = letter.capitalize()
!     return "\n<hr>\n<h2><a name=\"letter-%s\">%s</a></h2>\n\n" \
!            % (letter, lettername)
  
  
--- 284,289 ----
      else:
          lettername = letter.capitalize()
!     return "\n<hr />\n<h2 id=%s>%s</h2>\n\n" \
!            % (quoteattr("letter-" + letter), lettername)
  
  
***************
*** 295,299 ****
          s = "<b><a href=\"#letter-%s\">%s</a></b>" % (letter, letter)
          items.append(s)
!     s = ["<hr><center>\n%s</center>\n" % " |\n".join(items)]
      for letter, nodes in letter_groups:
          s.append(format_letter(letter))
--- 296,300 ----
          s = "<b><a href=\"#letter-%s\">%s</a></b>" % (letter, letter)
          items.append(s)
!     s = ["<hr /><center>\n%s</center>\n" % " |\n".join(items)]
      for letter, nodes in letter_groups:
          s.append(format_letter(letter))