Commits

Georg Brandl committed ba6608b Merge

merge with stable

Comments (0)

Files changed (2)

sphinx/themes/basic/static/doctools.js

  * doctools.js
  * ~~~~~~~~~~~
  *
- * Sphinx JavaScript utilties for all documentation.
+ * Sphinx JavaScript utilities for all documentation.
  *
  * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.

sphinx/writers/latex.py

         if self.table.col > 0:
             self.body.append(' & ')
         self.table.col += 1
-        self.context.append('')
+        context = ''
         if 'morerows' in node:
             self.body.append(' \multirow{')
             self.previous_spanning_row = 1
             self.body.append(str(node.get('morerows') + 1))
             self.body.append('}{*}{')
-            self.context.append('}')
+            context += '}'
             self.remember_multirow[self.table.col] = node.get('morerows') + 1
         if 'morecols' in node:
             self.body.append(' \multicolumn{')
                 self.body.append('}{|l|}{')
             else:
                 self.body.append('}{l|}{')
-            self.context.append('}')
+            context += '}'
         if isinstance(node.parent.parent, nodes.thead):
             self.body.append('\\textbf{')
-            self.context.append('}')
+            context += '}'
         if self.remember_multirow.get(self.table.col + 1, 0) > 1:
             self.remember_multirow[self.table.col + 1] -= 1
-            self.context.append(' & ')
+            context += ' & '
+        self.context.append(context)
     def depart_entry(self, node):
         self.body.append(self.context.pop()) # header
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.