[Python-checkins] r65554 - in doctools/trunk: doc/concepts.rst doc/conf.py doc/markup/para.rst sphinx/builder.py sphinx/htmlwriter.py sphinx/static/searchtools.js sphinx/templates/search.html tests/root/contents.txt tests/root/markup.txt

[georg.brandl]

Author: georg.brandl
Date: Wed Aug  6 16:46:11 2008
New Revision: 65554

Log:
Merged revisions 65532,65546-65547,65550-65551 via svnmerge from 
svn+ssh://pythondev@svn.python.org/doctools/branches/0.4.x

........
  r65532 | georg.brandl | 2008-08-04 22:35:07 +0000 (Mon, 04 Aug 2008) | 2 lines
  
  Add a test file for misc. markup and fix a doc bug.
........
  r65546 | georg.brandl | 2008-08-05 09:55:20 +0000 (Tue, 05 Aug 2008) | 2 lines
  
  Show an indication while downloading the search index.
........
  r65547 | georg.brandl | 2008-08-05 10:07:50 +0000 (Tue, 05 Aug 2008) | 2 lines
  
  Fix an indentation problem in production lists. #3477.
........
  r65550 | georg.brandl | 2008-08-05 16:21:34 +0000 (Tue, 05 Aug 2008) | 2 lines
  
  Remove unused interface.js.
........
  r65551 | georg.brandl | 2008-08-06 08:48:21 +0000 (Wed, 06 Aug 2008) | 2 lines
  
  Don't try to remove a nonexisting static dir.
........


Added:
   doctools/trunk/tests/root/markup.txt
      - copied unchanged from r65551, /doctools/branches/0.4.x/tests/root/markup.txt
Modified:
   doctools/trunk/   (props changed)
   doctools/trunk/doc/concepts.rst
   doctools/trunk/doc/conf.py
   doctools/trunk/doc/markup/para.rst
   doctools/trunk/sphinx/builder.py
   doctools/trunk/sphinx/htmlwriter.py
   doctools/trunk/sphinx/static/searchtools.js
   doctools/trunk/sphinx/templates/search.html
   doctools/trunk/tests/root/contents.txt

Modified: doctools/trunk/doc/concepts.rst
==============================================================================
--- doctools/trunk/doc/concepts.rst	(original)
+++ doctools/trunk/doc/concepts.rst	Wed Aug  6 16:46:11 2008
@@ -13,30 +13,8 @@
 :confval:`source_suffix`) and different OSes have different path separators,
 Sphinx abstracts them: all "document names" are relative to the :term:`source
 directory`, the extension is stripped, and path separators are converted to
-slashes :eq:`abc`.  All values, parameters and suchlike referring to "documents" expect
-such a document :math:`name\sqrt{3}`.
-
-.. math::
-   :label: abc
-
-   3x+4y \sqrt{4}
-   
-   x+y \\
-   z+z
-
-.. math:: a+b
-
-   c + d & = 5 \\
-   & = 6
-
-.. math:: 5x + 6
-
-.. math::
-   :label: def
-
-   test
-
-See :eq:`def`.
+slashes.  All values, parameters and suchlike referring to "documents" expect
+such a document name.
 
 
 The TOC tree

Modified: doctools/trunk/doc/conf.py
==============================================================================
--- doctools/trunk/doc/conf.py	(original)
+++ doctools/trunk/doc/conf.py	Wed Aug  6 16:46:11 2008
@@ -21,9 +21,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.addons.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.pngmath']
-#pngmath_use_preview = True
-jsmath_path = '/home/gbr/jsMath/easy/load.js'
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

Modified: doctools/trunk/doc/markup/para.rst
==============================================================================
--- doctools/trunk/doc/markup/para.rst	(original)
+++ doctools/trunk/doc/markup/para.rst	Wed Aug  6 16:46:11 2008
@@ -88,11 +88,9 @@
 
 .. directive:: centered
 
-   This directive creates a centered boldfaced paragraph.  Use it as follows::
+   This directive creates a centered boldfaced line of text.  Use it as follows::
 
-      .. centered::
-
-         Paragraph contents.
+      .. centered:: LICENSE AGREEMENT
 
 
 Table-of-contents markup

Modified: doctools/trunk/sphinx/builder.py
==============================================================================
--- doctools/trunk/sphinx/builder.py	(original)
+++ doctools/trunk/sphinx/builder.py	Wed Aug  6 16:46:11 2008
@@ -604,7 +604,8 @@
                 if path.isfile(fullname):
                     shutil.copyfile(fullname, targetname)
                 elif path.isdir(fullname):
-                    shutil.rmtree(targetname)
+                    if path.exists(targetname):
+                        shutil.rmtree(targetname)
                     shutil.copytree(fullname, targetname)
         # copy logo file (handled differently)
         if self.config.html_logo:

Modified: doctools/trunk/sphinx/htmlwriter.py
==============================================================================
--- doctools/trunk/sphinx/htmlwriter.py	(original)
+++ doctools/trunk/sphinx/htmlwriter.py	Wed Aug  6 16:46:11 2008
@@ -221,10 +221,9 @@
         maxlen = max(len(name) for name in names)
         for production in node:
             if production['tokenname']:
+                lastname = production['tokenname'].ljust(maxlen)
                 self.body.append(self.starttag(production, 'strong', ''))
-                self.body.append(production['tokenname'].ljust(maxlen) +
-                                 '</strong> ::= ')
-                lastname = production['tokenname']
+                self.body.append(lastname + '</strong> ::= ')
             else:
                 self.body.append('%s     ' % (' '*len(lastname)))
             production.walkabout(self)

Modified: doctools/trunk/sphinx/static/searchtools.js
==============================================================================
--- doctools/trunk/sphinx/static/searchtools.js	(original)
+++ doctools/trunk/sphinx/static/searchtools.js	Wed Aug  6 16:46:11 2008
@@ -243,6 +243,7 @@
         var dots = $('<span></span>').appendTo(title);
         var status = $('<p style="display: none"></p>').appendTo(out);
         var output = $('<ul class="search"/>').appendTo(out);
+        $('#search-progress').text('Getting search index...')
 
         // spawn a background runner for updating the dots
         // until the search has finished
@@ -300,6 +301,8 @@
                 var fileMap = {};
                 var files = null;
 
+                $('#search-progress').empty()
+
                 // perform the search on the required words
                 for (var i = 0; i < searchwords.length; i++) {
                     var word = searchwords[i];

Modified: doctools/trunk/sphinx/templates/search.html
==============================================================================
--- doctools/trunk/sphinx/templates/search.html	(original)
+++ doctools/trunk/sphinx/templates/search.html	Wed Aug  6 16:46:11 2008
@@ -12,6 +12,7 @@
   <form action="" method="get">
     <input type="text" name="q" value="" />
     <input type="submit" value="search" />
+    <span id="search-progress" style="padding-left: 10px"></span>
   </form>
   {% if search_performed %}
     <h2>Search Results</h2>

Modified: doctools/trunk/tests/root/contents.txt
==============================================================================
--- doctools/trunk/tests/root/contents.txt	(original)
+++ doctools/trunk/tests/root/contents.txt	Wed Aug  6 16:46:11 2008
@@ -12,6 +12,7 @@
 
    images
    includes
+   markup
 
 Indices and tables
 ==================